diff --git a/osinaweb/billing/__pycache__/tasks.cpython-310.pyc b/osinaweb/billing/__pycache__/tasks.cpython-310.pyc index 4301de41..352a520c 100644 Binary files a/osinaweb/billing/__pycache__/tasks.cpython-310.pyc and b/osinaweb/billing/__pycache__/tasks.cpython-310.pyc differ diff --git a/osinaweb/celerybeat-schedule.db b/osinaweb/celerybeat-schedule.db index 931ef97d..2de31d4d 100644 Binary files a/osinaweb/celerybeat-schedule.db and b/osinaweb/celerybeat-schedule.db differ diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3 index db980d8f..a57fe75a 100644 Binary files a/osinaweb/db.sqlite3 and b/osinaweb/db.sqlite3 differ diff --git a/osinaweb/osinacore/__pycache__/tasks.cpython-310.pyc b/osinaweb/osinacore/__pycache__/tasks.cpython-310.pyc index 57d70807..94084c00 100644 Binary files a/osinaweb/osinacore/__pycache__/tasks.cpython-310.pyc and b/osinaweb/osinacore/__pycache__/tasks.cpython-310.pyc differ diff --git a/osinaweb/osinacore/__pycache__/views.cpython-310.pyc b/osinaweb/osinacore/__pycache__/views.cpython-310.pyc index b0ef6031..a0b99cad 100644 Binary files a/osinaweb/osinacore/__pycache__/views.cpython-310.pyc and b/osinaweb/osinacore/__pycache__/views.cpython-310.pyc differ diff --git a/osinaweb/osinacore/templates/details_templates/staff-details.html b/osinaweb/osinacore/templates/details_templates/staff-details.html index 231d5fb6..aa21adf1 100644 --- a/osinaweb/osinacore/templates/details_templates/staff-details.html +++ b/osinaweb/osinacore/templates/details_templates/staff-details.html @@ -67,33 +67,42 @@ -
-
- {% for position in positions %} -
-
-

Position: Junior Software - Engineer

-

Start Date: 20-1-2020

-

End Date: 20-1-2020

-
+
+ {% for position in positions %} +
+
+

Position: {{position.position}} +

+

Start Date: {{position.start_date}}

+ {% if not position.end_date %} - Present {% endif %} + {% if position.end_date %} +

End Date: {{position.end_date}} +

+ {% endif %} +
-
- - - -
+
+ + +
- {% endfor %} +
+ {% endfor %} +
+ + + {% csrf_token %} +
+
+ + + +

Add New Position

+
+ - -
- - - -

Add New Position

-
diff --git a/osinaweb/osinacore/templates/index.html b/osinaweb/osinacore/templates/index.html index 8a91a420..77c8910b 100644 --- a/osinaweb/osinacore/templates/index.html +++ b/osinaweb/osinacore/templates/index.html @@ -3,7 +3,7 @@ {% block content %} -
+
- + {% for ticket in open_tickets %} - - -
-

{{ticket.title}}

- - {% if ticket.unread_updates_count > 0 %} -
-
-

{{ticket.unread_updates_count}}

-
-
- {% endif %} -
- - - - -

{{ticket.ticket_number}}

- - - -

{{ticket.regarding}}

- - - - {% if ticket.ticketupdate_set.all %} -

{{ticket.ticketupdate_set.all.last.date_added}}
by {{ticket.ticketupdate_set.all.last.added_by.first_name}}

- {% endif %} - - - - -
- - - - - - - - - - - - - -
- - - -
-
- - + {% include 'details_templates/partials/ticket-display.html' %} {% endfor %} @@ -125,7 +52,7 @@ {% if tasks %} -