Fossil SCM
Change piechart table to view since tables have undefined order
Commit
7c1568e3a03d70b9164317f65b988df3dbaea526
Parent
6b292eaa7819262…
1 file changed
+18
-16
+18
-16
| --- src/statrep.c | ||
| +++ src/statrep.c | ||
| @@ -334,12 +334,12 @@ | ||
| 334 | 334 | all rows. */ |
| 335 | 335 | stats_report_init_view(); |
| 336 | 336 | @ <h1>Timeline Events |
| 337 | 337 | @ (%s(stats_report_label_for_type())) by User</h1> |
| 338 | 338 | db_multi_exec( |
| 339 | - "CREATE TEMP TABLE piechart(amt,label);" | |
| 340 | - "INSERT INTO piechart SELECT count(*), ifnull(euser,user) FROM v_reports" | |
| 339 | + "CREATE TEMP VIEW piechart(amt,label) AS" | |
| 340 | + " SELECT count(*), ifnull(euser,user) FROM v_reports" | |
| 341 | 341 | " GROUP BY ifnull(euser,user) ORDER BY count(*) DESC;" |
| 342 | 342 | ); |
| 343 | 343 | if( db_int(0, "SELECT count(*) FROM piechart")>=2 ){ |
| 344 | 344 | @ <center><svg width=700 height=400> |
| 345 | 345 | piechart_render(700, 400, PIE_OTHER|PIE_PERCENT); |
| @@ -482,24 +482,26 @@ | ||
| 482 | 482 | if( zUserName ){ |
| 483 | 483 | @ for user %h(zUserName) |
| 484 | 484 | } |
| 485 | 485 | @ </h1> |
| 486 | 486 | db_multi_exec( |
| 487 | - "CREATE TEMP TABLE piechart(amt,label);" | |
| 488 | - "INSERT INTO piechart" | |
| 489 | - " SELECT count(*), cast(strftime('%%w', mtime) AS INT) FROM v_reports" | |
| 490 | - " WHERE ifnull(coalesce(euser,user,'')=%Q,1)" | |
| 491 | - " GROUP BY 2 ORDER BY 2;" | |
| 492 | - "UPDATE piechart SET label = CASE label" | |
| 493 | - " WHEN 0 THEN 'Sunday'" | |
| 494 | - " WHEN 1 THEN 'Monday'" | |
| 495 | - " WHEN 2 THEN 'Tuesday'" | |
| 496 | - " WHEN 3 THEN 'Wednesday'" | |
| 497 | - " WHEN 4 THEN 'Thursday'" | |
| 498 | - " WHEN 5 THEN 'Friday'" | |
| 499 | - " WHEN 6 THEN 'Saturday'" | |
| 500 | - " ELSE 'ERROR' END;", zUserName | |
| 487 | + "CREATE TEMP VIEW piechart(amt,label) AS" | |
| 488 | + " SELECT count(*)," | |
| 489 | + " CASE cast(strftime('%%w', mtime) AS INT)" | |
| 490 | + " WHEN 0 THEN 'Sunday'" | |
| 491 | + " WHEN 1 THEN 'Monday'" | |
| 492 | + " WHEN 2 THEN 'Tuesday'" | |
| 493 | + " WHEN 3 THEN 'Wednesday'" | |
| 494 | + " WHEN 4 THEN 'Thursday'" | |
| 495 | + " WHEN 5 THEN 'Friday'" | |
| 496 | + " WHEN 6 THEN 'Saturday'" | |
| 497 | + " ELSE 'ERROR'" | |
| 498 | + " END" | |
| 499 | + " FROM v_reports" | |
| 500 | + " WHERE ifnull(coalesce(euser,user,'')=%Q,1)" | |
| 501 | + " GROUP BY 2 ORDER BY 2;" | |
| 502 | + , zUserName | |
| 501 | 503 | ); |
| 502 | 504 | if( db_int(0, "SELECT count(*) FROM piechart")>=2 ){ |
| 503 | 505 | @ <center><svg width=700 height=400> |
| 504 | 506 | piechart_render(700, 400, PIE_OTHER|PIE_PERCENT); |
| 505 | 507 | @ </svg></centre><hr/> |
| 506 | 508 |
| --- src/statrep.c | |
| +++ src/statrep.c | |
| @@ -334,12 +334,12 @@ | |
| 334 | all rows. */ |
| 335 | stats_report_init_view(); |
| 336 | @ <h1>Timeline Events |
| 337 | @ (%s(stats_report_label_for_type())) by User</h1> |
| 338 | db_multi_exec( |
| 339 | "CREATE TEMP TABLE piechart(amt,label);" |
| 340 | "INSERT INTO piechart SELECT count(*), ifnull(euser,user) FROM v_reports" |
| 341 | " GROUP BY ifnull(euser,user) ORDER BY count(*) DESC;" |
| 342 | ); |
| 343 | if( db_int(0, "SELECT count(*) FROM piechart")>=2 ){ |
| 344 | @ <center><svg width=700 height=400> |
| 345 | piechart_render(700, 400, PIE_OTHER|PIE_PERCENT); |
| @@ -482,24 +482,26 @@ | |
| 482 | if( zUserName ){ |
| 483 | @ for user %h(zUserName) |
| 484 | } |
| 485 | @ </h1> |
| 486 | db_multi_exec( |
| 487 | "CREATE TEMP TABLE piechart(amt,label);" |
| 488 | "INSERT INTO piechart" |
| 489 | " SELECT count(*), cast(strftime('%%w', mtime) AS INT) FROM v_reports" |
| 490 | " WHERE ifnull(coalesce(euser,user,'')=%Q,1)" |
| 491 | " GROUP BY 2 ORDER BY 2;" |
| 492 | "UPDATE piechart SET label = CASE label" |
| 493 | " WHEN 0 THEN 'Sunday'" |
| 494 | " WHEN 1 THEN 'Monday'" |
| 495 | " WHEN 2 THEN 'Tuesday'" |
| 496 | " WHEN 3 THEN 'Wednesday'" |
| 497 | " WHEN 4 THEN 'Thursday'" |
| 498 | " WHEN 5 THEN 'Friday'" |
| 499 | " WHEN 6 THEN 'Saturday'" |
| 500 | " ELSE 'ERROR' END;", zUserName |
| 501 | ); |
| 502 | if( db_int(0, "SELECT count(*) FROM piechart")>=2 ){ |
| 503 | @ <center><svg width=700 height=400> |
| 504 | piechart_render(700, 400, PIE_OTHER|PIE_PERCENT); |
| 505 | @ </svg></centre><hr/> |
| 506 |
| --- src/statrep.c | |
| +++ src/statrep.c | |
| @@ -334,12 +334,12 @@ | |
| 334 | all rows. */ |
| 335 | stats_report_init_view(); |
| 336 | @ <h1>Timeline Events |
| 337 | @ (%s(stats_report_label_for_type())) by User</h1> |
| 338 | db_multi_exec( |
| 339 | "CREATE TEMP VIEW piechart(amt,label) AS" |
| 340 | " SELECT count(*), ifnull(euser,user) FROM v_reports" |
| 341 | " GROUP BY ifnull(euser,user) ORDER BY count(*) DESC;" |
| 342 | ); |
| 343 | if( db_int(0, "SELECT count(*) FROM piechart")>=2 ){ |
| 344 | @ <center><svg width=700 height=400> |
| 345 | piechart_render(700, 400, PIE_OTHER|PIE_PERCENT); |
| @@ -482,24 +482,26 @@ | |
| 482 | if( zUserName ){ |
| 483 | @ for user %h(zUserName) |
| 484 | } |
| 485 | @ </h1> |
| 486 | db_multi_exec( |
| 487 | "CREATE TEMP VIEW piechart(amt,label) AS" |
| 488 | " SELECT count(*)," |
| 489 | " CASE cast(strftime('%%w', mtime) AS INT)" |
| 490 | " WHEN 0 THEN 'Sunday'" |
| 491 | " WHEN 1 THEN 'Monday'" |
| 492 | " WHEN 2 THEN 'Tuesday'" |
| 493 | " WHEN 3 THEN 'Wednesday'" |
| 494 | " WHEN 4 THEN 'Thursday'" |
| 495 | " WHEN 5 THEN 'Friday'" |
| 496 | " WHEN 6 THEN 'Saturday'" |
| 497 | " ELSE 'ERROR'" |
| 498 | " END" |
| 499 | " FROM v_reports" |
| 500 | " WHERE ifnull(coalesce(euser,user,'')=%Q,1)" |
| 501 | " GROUP BY 2 ORDER BY 2;" |
| 502 | , zUserName |
| 503 | ); |
| 504 | if( db_int(0, "SELECT count(*) FROM piechart")>=2 ){ |
| 505 | @ <center><svg width=700 height=400> |
| 506 | piechart_render(700, 400, PIE_OTHER|PIE_PERCENT); |
| 507 | @ </svg></centre><hr/> |
| 508 |