Merge branch 'web' of git.c3sl.ufpr.br:minicom/datasid/testing into web
Signed-off-by:
Eduardo L. Buratti <elb09@c3sl.ufpr.br>
Conflicts:
web/assets/js/attendance.js
No related branches found
No related tags found
Showing
- web/app/partials/attendance.gesac.html 18 additions, 0 deletionsweb/app/partials/attendance.gesac.html
- web/assets/js/attendance.js 111 additions, 14 deletionsweb/assets/js/attendance.js
- web/assets/less/attendance.less 13 additions, 1 deletionweb/assets/less/attendance.less
- web/queries/gesac/avail/current.sql 11 additions, 0 deletionsweb/queries/gesac/avail/current.sql
- web/queries/gesac/avail/hist.sql 17 additions, 0 deletionsweb/queries/gesac/avail/hist.sql
- web/queries/gesac/avail/sub_cities.sql 14 additions, 0 deletionsweb/queries/gesac/avail/sub_cities.sql
- web/queries/gesac/avail/sub_regions.sql 12 additions, 0 deletionsweb/queries/gesac/avail/sub_regions.sql
- web/queries/gesac/avail/sub_states.sql 13 additions, 0 deletionsweb/queries/gesac/avail/sub_states.sql
- web/queries/gesac/avail/sub_telecenters.sql 15 additions, 0 deletionsweb/queries/gesac/avail/sub_telecenters.sql
- web/queries/gesac/net_usage/sub_cities.sql 26 additions, 0 deletionsweb/queries/gesac/net_usage/sub_cities.sql
- web/queries/gesac/net_usage/sub_regions.sql 22 additions, 0 deletionsweb/queries/gesac/net_usage/sub_regions.sql
- web/queries/gesac/net_usage/sub_states.sql 24 additions, 0 deletionsweb/queries/gesac/net_usage/sub_states.sql
- web/queries/gesac/net_usage/sub_telecenters.sql 16 additions, 0 deletionsweb/queries/gesac/net_usage/sub_telecenters.sql
- web/queries/gesac/net_usage/telecenter.sql 12 additions, 0 deletionsweb/queries/gesac/net_usage/telecenter.sql
- web/routes/charts.js 50 additions, 0 deletionsweb/routes/charts.js
Loading
Please register or sign in to comment