diff --git a/accounts/templates/accounts/account_detail.html b/accounts/templates/accounts/account_detail.html index cb7381d..41bd090 100644 --- a/accounts/templates/accounts/account_detail.html +++ b/accounts/templates/accounts/account_detail.html @@ -5,11 +5,16 @@

{{ user.first_name }} {{ user.last_name }}

{{ user.email }}

+ {% if user.student %} +

{{ user.student.department }}

+ {% elif user.instructor %} +

{{ user.instructor.department }}

+ {% endif %} {% if periods %}

Total clocked hours: {{ periods.total|timedelta_format }}

{% endif %}

- Update + Update email/change password

{% endblock %} diff --git a/attendance/templates/attendance/_student_periods.html b/attendance/templates/attendance/_student_periods.html index d46eff2..be4f6fe 100644 --- a/attendance/templates/attendance/_student_periods.html +++ b/attendance/templates/attendance/_student_periods.html @@ -3,6 +3,7 @@ Station + Date Clocked in Clocked out Duration @@ -13,9 +14,10 @@ {% if period.clocked_out %} {{ period.station_number }} - {{ period.clocked_in }} + {{ period.clocked_in|date:"M d, y" }} + {{ period.clocked_in|time:"P" }} {% if period.clocked_out %} - {{ period.clocked_out }} + {{ period.clocked_out|time:"P" }} {{ period.clocked_in|timesince:period.clocked_out }} {% else %} Current sesson: {{ period.clocked_in|timesince }} diff --git a/attendance/templates/attendance/attendance_overview_student.html b/attendance/templates/attendance/attendance_overview_student.html index 0569ece..367d1d8 100644 --- a/attendance/templates/attendance/attendance_overview_student.html +++ b/attendance/templates/attendance/attendance_overview_student.html @@ -20,8 +20,7 @@

Attendance log

-

Total hours for the month: {{ period_total.total|timedelta_format:2 }}
- (Does not include current session.)

+

Total hours for the month: {{ period_total.total|timedelta_format:2 }} (Does not include current session.)

{% include 'attendance/_student_periods.html' %}
diff --git a/home/templates/home/home.html b/home/templates/home/home.html index 2d8144b..2117e6b 100644 --- a/home/templates/home/home.html +++ b/home/templates/home/home.html @@ -2,5 +2,23 @@ {% load static %} {% block content %} -

Welcome home

+
+
+

Welcome to
+ Btech Time Tracker

+

Know exactly how many hours you've clocked, anytime, anywhere.

+
+
+

No more paper

+

No more reading bad handwriting or putting the wrong date or time.

+
+
+

No more questions

+

No more asking your instructor, or being asked by your student how many hours they have.

+
+
+

No more manual entry

+

We invented computers to do that for us.

+
+
{% endblock %} diff --git a/static/scss/_nav.scss b/static/scss/_nav.scss index b379aa9..1706904 100644 --- a/static/scss/_nav.scss +++ b/static/scss/_nav.scss @@ -1,6 +1,7 @@ .navbar { display: flex; justify-content: space-between; + align-items: center; margin: 1rem; &__logo { @@ -8,20 +9,8 @@ font-size: 1rem; } - &__nav { - + &__user { + margin-right: 1rem; } } - -.nav { - &nav__user { - - } - &nav__logout { - - } - &nav__login { - - } -} diff --git a/static/scss/main.scss b/static/scss/main.scss index 81363ac..d4efdbf 100644 --- a/static/scss/main.scss +++ b/static/scss/main.scss @@ -4,6 +4,7 @@ @import "forms"; @import "nav"; @import "messages"; +@import "home"; @import "registration"; @import "students"; @import "instructors"; diff --git a/templates/application.html b/templates/application.html index f828931..c97be21 100644 --- a/templates/application.html +++ b/templates/application.html @@ -18,17 +18,21 @@ {% endcompress %} -