Staffhours/stats #373

vaibhavjayaraman · 2018-03-04T09:17:58Z

Changes format of staffhours page, adds metabase graphs to mirror stats page

abizer · 2018-03-06T09:05:05Z

please include a screenshot and also separate the mirrors addition into a different PR

chriskuehl · 2018-03-06T21:53:20Z

ocfweb/main/home.py

@@ -12,7 +12,7 @@
 from ocfweb.component.lab_status import get_lab_status


-@periodic(60, ttl=86400)
+@periodic(60)


why this change?

this was intentional so that when people screw up the file format (happens all the time) the home page will just have stale data (rather than error out)

the 60 means it still gets updated every 60 seconds when everything is happy

chriskuehl · 2018-03-06T21:53:40Z

ocfweb/main/templates/main/staff-hours.html

 </div>
 {% endfor %}
 </div>
-
+ </script>


chriskuehl · 2018-03-06T21:54:09Z

ocfweb/main/templatetags/staff_hours.py

@@ -1,8 +1,20 @@
 from django import template

+from ocfweb.templatetags.lab_hours import lab_hours_holiday as holiday_hours


why renaming this function during import? it's better to avoid this except when necessary as it leads to confusion about what function it really is

chriskuehl · 2018-03-06T21:54:36Z

ocfweb/static/js/site.js

@@ -6,6 +6,8 @@ $(document).ready(function() {
 $('body').css('margin-bottom', height);
 };

+ $('[data-toogle="tooltip"]').tooltip();


chriskuehl · 2018-03-06T21:55:03Z

ocfweb/static/scss/pages/_mirrors.scss

@@ -0,0 +1,13 @@
+.mirrors-pie-chart {


this needs a .page-mirrors or whatever wrapping the entire CSS file, see the other page-specific CSS files for examples

chriskuehl · 2018-03-06T21:55:25Z

ocfweb/stats/templates/stats/mirrors.html

+ </div>
+ <div class= "mirrors-mirror-usage">
+ <iframe src="https://metabase.ocf.berkeley.edu/public/question/23f5e403-315c-432e-ae9f-3db0970517f7"
+ frameborder="0"width="100%"height="100%"allowtransparency></iframe>


spaces between html attributes

chriskuehl · 2018-03-06T21:55:39Z

ocfweb/stats/templates/stats/mirrors.html

+ {% stats_navbar %}
+ <h2> Bandwidth usage per mirrored project </h2>
+ <div class="mirrors-pie-chart">
+ <iframe src="https://metabase.ocf.berkeley.edu/public/question/b8783817-1e98-4658-ae8a-2826dbeff4ab" frameborder="0" width="100%" height="100%"allowtransparen></iframe>


spaces between html attributes, fix weird spacing

chriskuehl · 2018-03-06T21:55:46Z

ocfweb/stats/templates/stats/mirrors.html

 <div class="col-md-6">
 <h4> Bandwidth Usage Since {{ start_date }} </h4>
- <br />
+ <br/>


kpengboy · 2018-03-10T05:54:06Z

ocfweb/main/templates/main/staff-hours.html

+ <div class = "day">
+ <div class="daytitle">
+ <strong><big>{{staff_day.day}}</big></strong>
+ {%if staff_day.holiday != None %}


{%if staff_day.holiday is not none %}

@vaibhavjayaraman To explain this, is checks object identity eg if they are the same thing, == checks equality. Since None is a singleton (there can only be one), is/is not is faster and easier to read.

kpengboy · 2018-03-10T05:54:40Z

ocfweb/main/templates/main/staff-hours.html

+ <div class="daytitle">
+ <strong><big>{{staff_day.day}}</big></strong>
+ {%if staff_day.holiday != None %}
+ <span class="cancelled-text"> {{staff_day.holiday}} </span>


Why the extra spaces between the <span> and </span>?

hours for staff hours are above each staff member staff-hours grouped by hour functionally working added reason for why ason for why staff hours are cancelled to header of staff hours removed print statementint statements and reason for cancellation is next to staff hours got rid of borders in individual days in staff hours <hr /> added around each hour in staff hours changed hr tag added comment changed weekdays to days in the week functionally working, need to delete last hr tag got rid of hr tag Fixed some formatting issues readded gray out feature to staff hours hours adds if holiday will cancel jan 17 some yaml changes made changed some of staff_hours.html to adhere to ocflib Altering home.py for staff_hours column in it tuesday made changes to staff_hours.html font size for different days worked on staff_hours.html and staff_hours css changed home.html staff hours and related css got rid of cancelled staff hours from each day added metabase graphs to mirrors.html finished adding staff bios width for staff-faces set to 175px changed staff-hour spacing to 165px and can handle multiple lines of staff per hour in staff hours

kpengboy · 2018-04-21T07:27:26Z

ocfweb/main/templates/main/staff-hours.html

- {% if staff_hour.cancelled or staff_hour.day == today and lab_status.force_lab_closed %}
- <span class="cancelled-text">cancelled this week</span>
+ {% for staff_day in staff_hours %}
+ <div class = "day">


Let's please not have spaces around the equal sign

kpengboy · 2018-04-21T07:28:26Z

ocfweb/main/templates/main/home.html

@@ -108,8 +108,11 @@ <h3>OCF Computer Lab</h3>
 </ul>

 <div class="ocf-staffhours">
+ <span class="title">


This should be indented

Agreed, indentation on the whole <span> element would be good.

kpengboy · 2018-04-21T07:33:19Z

ocfweb/main/templates/main/staff-hours.html

+ <div class="hour {% if staff_hour.cancelled %} cancelled {% endif %}">
+ <div class="title">
+ <strong>{{staff_hour.time}}</strong>
+ {% if staff_hour.cancelled or lab_status.force_lab_closed and staff_day == today%}


nit: should have space before %}

kpengboy · 2018-04-21T07:34:02Z

ocfweb/main/templates/main/staff-hours.html

+ <div class="title">
+ <strong>{{staff_hour.time}}</strong>
+ {% if staff_hour.cancelled or lab_status.force_lab_closed and staff_day == today%}
+ <span class="cancelled-text"> cancelled this week</span>


Is the space before "cancelled" necessary?

kpengboy · 2018-04-21T07:35:13Z

ocfweb/static/scss/pages/_staff-hours.scss

+ margin-bottom: 20px;
+
+ h4,
+ h5 {


Please fix this indentation

kpengboy · 2018-04-21T07:35:46Z

ocfweb/stats/templates/stats/mirrors.html

 {% block content %}
 <div class="ocf-content-block">
- {% stats_navbar %}


Why has this been de-indented

jvperrin

I've got a few comments but not too much so far, could you give screenshots of the different pages that are modified in this PR so we can see what they look like?

jvperrin · 2018-04-29T22:11:49Z

ocfweb/main/templates/main/home.html

@@ -108,8 +108,11 @@ <h3>OCF Computer Lab</h3>
 </ul>

 <div class="ocf-staffhours">
+ <span class="title">


Agreed, indentation on the whole <span> element would be good.

jvperrin · 2018-04-29T22:17:19Z

ocfweb/stats/templates/stats/mirrors.html

-  <div class="row">
+ {% stats_navbar %}
+ <h2> Bandwidth usage per mirrored project </h2>
+ <div class="row">


Yeah I don't think any changes are needed for this page from the looks of things

jvperrin · 2018-04-29T22:18:23Z

ocfweb/static/scss/pages/_mirrors.scss

+ padding: 10px;
+ margin: 0;
+ }
+}


I think the addition of this file probably belongs in a separate pull request, since these aren't used at all yet.

Changes to staff hours page and staff hours section of home page.

kkuehlz · 2018-06-25T06:22:42Z

@vaibhavjayaraman hello. friendly reminder to revisit this

chriskuehl reviewed Mar 6, 2018

View reviewed changes

kpengboy requested changes Mar 10, 2018

View reviewed changes

Vaibhav Jayaraman added 5 commits April 12, 2018 18:21

about to change a line of html in staff-hours.html

dafd95f

ready to pull

af6fde9

fixed merge conflict that came from squashing

cf1bede

addressed review comments

88a5082

vaibhavjayaraman force-pushed the staffhours branch from 663df43 to 88a5082 Compare April 13, 2018 01:24

removed changes from mirrors.html

6db1533

kpengboy requested changes Apr 21, 2018

View reviewed changes

jvperrin reviewed Apr 29, 2018

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Staffhours/stats #373

Staffhours/stats #373

vaibhavjayaraman commented Mar 4, 2018

abizer commented Mar 6, 2018

chriskuehl Mar 6, 2018 •

edited

Loading

chriskuehl Mar 6, 2018

chriskuehl Mar 6, 2018

chriskuehl Mar 6, 2018

chriskuehl Mar 6, 2018

chriskuehl Mar 6, 2018

chriskuehl Mar 6, 2018

chriskuehl Mar 6, 2018

kpengboy Mar 10, 2018

ethanhs Mar 12, 2018

kpengboy Mar 10, 2018

kpengboy Apr 21, 2018

kpengboy Apr 21, 2018

jvperrin Apr 29, 2018

kpengboy Apr 21, 2018

kpengboy Apr 21, 2018

kpengboy Apr 21, 2018

kpengboy Apr 21, 2018

jvperrin left a comment

jvperrin Apr 29, 2018

jvperrin Apr 29, 2018

jvperrin Apr 29, 2018

vaibhavjayaraman Apr 30, 2018

kkuehlz commented Jun 25, 2018

		@@ -1,8 +1,20 @@
		from django import template

		from ocfweb.templatetags.lab_hours import lab_hours_holiday as holiday_hours

Staffhours/stats #373

Are you sure you want to change the base?

Staffhours/stats #373

Conversation

vaibhavjayaraman commented Mar 4, 2018

abizer commented Mar 6, 2018

chriskuehl Mar 6, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jvperrin left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kkuehlz commented Jun 25, 2018

chriskuehl Mar 6, 2018 •

edited

Loading