|
- {{business.name}}
+
+
+ 
+
+ {{business.name}}
+ |
@@ -192,7 +200,8 @@
-
@@ -206,25 +215,182 @@
- {% if latest_statuses_time_ago %}
-
- USERS ACTIVITY
-
+
+
+
+
- {% include 'recent-activities.html' %}
+
+
+
+
+ 
+
+
+
+
+
+ 
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {% if latest_statuses_time_ago %}
+
+ USERS ACTIVITY
+
+
+ {% include 'recent-activities.html' %}
+
-
- {% else %}
-
- USERS ACTIVITY
-
+ {% else %}
+
+ USERS ACTIVITY
+
- {% include 'recent-activities.html' %}
+ {% include 'recent-activities.html' %}
+
+ {% endif %}
- {% endif %}
diff --git a/osinaweb/templates/listing_pages/customers.html b/osinaweb/templates/listing_pages/customers.html
index e3b58058..968c7fc1 100644
--- a/osinaweb/templates/listing_pages/customers.html
+++ b/osinaweb/templates/listing_pages/customers.html
@@ -21,7 +21,8 @@
onclick="closeModal()">
Customers
-
+
-
@@ -225,25 +228,183 @@
- {% if latest_statuses_time_ago %}
-
- USERS ACTIVITY
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {% if latest_statuses_time_ago %}
+
+ USERS ACTIVITY
+
- {% include 'recent-activities.html' %}
+ {% include 'recent-activities.html' %}
+
-
- {% else %}
-
- USERS ACTIVITY
-
+ {% else %}
+
+ USERS ACTIVITY
+
- {% include 'recent-activities.html' %}
+ {% include 'recent-activities.html' %}
+
+ {% endif %}
- {% endif %}
diff --git a/osinaweb/templates/listing_pages/daily-reports.html b/osinaweb/templates/listing_pages/daily-reports.html
index f6a48fae..c249517b 100644
--- a/osinaweb/templates/listing_pages/daily-reports.html
+++ b/osinaweb/templates/listing_pages/daily-reports.html
@@ -21,7 +21,8 @@
onclick="closeModal()">
@@ -175,25 +176,182 @@
- {% if latest_statuses_time_ago %}
-
- USERS ACTIVITY
-
+
+
+
+
- {% include 'recent-activities.html' %}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {% if latest_statuses_time_ago %}
+
+ USERS ACTIVITY
+
+
+ {% include 'recent-activities.html' %}
+
-
- {% else %}
-
- USERS ACTIVITY
-
+ {% else %}
+
+ USERS ACTIVITY
+
- {% include 'recent-activities.html' %}
+ {% include 'recent-activities.html' %}
+
+ {% endif %}
- {% endif %}
diff --git a/osinaweb/templates/listing_pages/notes.html b/osinaweb/templates/listing_pages/notes.html
index 961b896e..f2eb40a6 100644
--- a/osinaweb/templates/listing_pages/notes.html
+++ b/osinaweb/templates/listing_pages/notes.html
@@ -21,7 +21,8 @@
onclick="closeModal()">
@@ -128,8 +129,8 @@
style="background-color: {{note.color}}">
{{ note.date|date:"F j, Y" }}
- USERS ACTIVITY
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {% if latest_statuses_time_ago %}
+
+ USERS ACTIVITY
+
- {% include 'recent-activities.html' %}
+ {% include 'recent-activities.html' %}
+
-
- {% else %}
-
- USERS ACTIVITY
-
+ {% else %}
+
+ USERS ACTIVITY
+
- {% include 'recent-activities.html' %}
+ {% include 'recent-activities.html' %}
+
+ {% endif %}
- {% endif %}
diff --git a/osinaweb/templates/listing_pages/project-types.html b/osinaweb/templates/listing_pages/project-types.html
index 54e3f42f..1d84b358 100644
--- a/osinaweb/templates/listing_pages/project-types.html
+++ b/osinaweb/templates/listing_pages/project-types.html
@@ -21,7 +21,8 @@
onclick="closeModal()">
Project Types
-
+
+ class="w-full s:w-fit text-base px-3 py-2 bg-blue-500 text-white outline-none border border-blue-500 rounded-md cursor-pointer hover:bg-white hover:text-blue-500 addProjectTypeButton"
+ data-modal-url="{% url 'addprojecttype' %}">Add
+ Project Type
@@ -176,25 +180,182 @@
- USERS ACTIVITY
-
+
+
+
+
- {% include 'recent-activities.html' %}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {% if latest_statuses_time_ago %}
+
+ USERS ACTIVITY
+
+
+ {% include 'recent-activities.html' %}
+
-
- {% else %}
-
- USERS ACTIVITY
-
+ {% else %}
+
+ USERS ACTIVITY
+
- {% include 'recent-activities.html' %}
+ {% include 'recent-activities.html' %}
+
+ {% endif %}
- {% endif %}
diff --git a/osinaweb/templates/listing_pages/projects.html b/osinaweb/templates/listing_pages/projects.html
index a379611e..a5e7dd48 100644
--- a/osinaweb/templates/listing_pages/projects.html
+++ b/osinaweb/templates/listing_pages/projects.html
@@ -178,7 +178,8 @@
{{project.name}}
|
-
+ |
{% if project.recent_note_date %}
{{ project.recent_note_text }}
{% else %}
@@ -239,26 +240,182 @@
- {% if latest_statuses_time_ago %}
-
- USERS ACTIVITY
-
+
+
+
+
- {% include 'recent-activities.html' %}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {% if latest_statuses_time_ago %}
+
+ USERS ACTIVITY
+
+
+ {% include 'recent-activities.html' %}
+
-
- {% else %}
-
- USERS ACTIVITY
-
+ {% else %}
+
+ USERS ACTIVITY
+
- {% include 'recent-activities.html' %}
+ {% include 'recent-activities.html' %}
+
+ {% endif %}
- {% endif %}
diff --git a/osinaweb/templates/listing_pages/references.html b/osinaweb/templates/listing_pages/references.html
index 5f72fd72..628f15fb 100644
--- a/osinaweb/templates/listing_pages/references.html
+++ b/osinaweb/templates/listing_pages/references.html
@@ -21,7 +21,8 @@
onclick="closeModal()">
References
-
+
- {% if latest_statuses_time_ago %}
-
- USERS ACTIVITY
-
+
+
+
+
- {% include 'recent-activities.html' %}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {% if latest_statuses_time_ago %}
+
+ USERS ACTIVITY
+
+
+ {% include 'recent-activities.html' %}
+
-
- {% else %}
-
- USERS ACTIVITY
-
+ {% else %}
+
+ USERS ACTIVITY
+
- {% include 'recent-activities.html' %}
+ {% include 'recent-activities.html' %}
+
+ {% endif %}
- {% endif %}
diff --git a/osinaweb/templates/listing_pages/staff-positions.html b/osinaweb/templates/listing_pages/staff-positions.html
index 03e3f0ac..b16e31a8 100644
--- a/osinaweb/templates/listing_pages/staff-positions.html
+++ b/osinaweb/templates/listing_pages/staff-positions.html
@@ -22,7 +22,8 @@
onclick="closeModal()">
@@ -114,7 +115,8 @@
Staff Positions
-
+
- {% if latest_statuses_time_ago %}
-
- USERS ACTIVITY
-
+
+
+
+
- {% include 'recent-activities.html' %}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {% if latest_statuses_time_ago %}
+
+ USERS ACTIVITY
+
+
+ {% include 'recent-activities.html' %}
+
-
- {% else %}
-
- USERS ACTIVITY
-
+ {% else %}
+
+ USERS ACTIVITY
+
- {% include 'recent-activities.html' %}
+ {% include 'recent-activities.html' %}
+
+ {% endif %}
- {% endif %}
diff --git a/osinaweb/templates/listing_pages/staffs.html b/osinaweb/templates/listing_pages/staffs.html
index 2675512a..332a1066 100644
--- a/osinaweb/templates/listing_pages/staffs.html
+++ b/osinaweb/templates/listing_pages/staffs.html
@@ -22,7 +22,8 @@
onclick="closeModal()">
@@ -159,14 +160,15 @@
{% for staff in staffs %}
-
+ {% if staff.active %}
+
- {{staff.user.first_name}} {{staff.user.last_name}}
+ {{staff.user.first_name}} {{staff.user.last_name}}
|
@@ -186,12 +188,49 @@
-
+ {% else %}
+
+
+
+
+ 
+
+ {{staff.user.first_name}} {{staff.user.last_name}}
+ |
+
+
+ {{staff.user.email}}
+ |
+
+
+
+ |
+
+ {% endif %}
{% endfor %}
@@ -200,25 +239,182 @@
- {% if latest_statuses_time_ago %}
-
- USERS ACTIVITY
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {% if latest_statuses_time_ago %}
+
+ USERS ACTIVITY
+
- {% include 'recent-activities.html' %}
+ {% include 'recent-activities.html' %}
+
-
- {% else %}
-
- USERS ACTIVITY
-
+ {% else %}
+
+ USERS ACTIVITY
+
- {% include 'recent-activities.html' %}
+ {% include 'recent-activities.html' %}
+
+ {% endif %}
- {% endif %}
diff --git a/osinaweb/templates/listing_pages/tags.html b/osinaweb/templates/listing_pages/tags.html
index a3102767..d77ad42f 100644
--- a/osinaweb/templates/listing_pages/tags.html
+++ b/osinaweb/templates/listing_pages/tags.html
@@ -21,7 +21,8 @@
onclick="closeModal()">
@@ -113,7 +114,8 @@
Tags
-
+
- {% if latest_statuses_time_ago %}
-
- USERS ACTIVITY
-
+
+
+
+
- {% include 'recent-activities.html' %}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {% if latest_statuses_time_ago %}
+
+ USERS ACTIVITY
+
+
+ {% include 'recent-activities.html' %}
+
-
- {% else %}
-
- USERS ACTIVITY
-
+ {% else %}
+
+ USERS ACTIVITY
+
- {% include 'recent-activities.html' %}
+ {% include 'recent-activities.html' %}
+
+ {% endif %}
- {% endif %}
diff --git a/osinaweb/templates/listing_pages/tasks.html b/osinaweb/templates/listing_pages/tasks.html
index 9ece0c8c..af08a0fb 100644
--- a/osinaweb/templates/listing_pages/tasks.html
+++ b/osinaweb/templates/listing_pages/tasks.html
@@ -20,7 +20,8 @@
onclick="closeModal()">
@@ -496,25 +497,182 @@
- {% if latest_statuses_time_ago %}
-
- USERS ACTIVITY
-
+
+
+
+
- {% include 'recent-activities.html' %}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {% if latest_statuses_time_ago %}
+
+ USERS ACTIVITY
+
+ {% include 'recent-activities.html' %}
+
+
-
- {% else %}
-
- USERS ACTIVITY
-
+ {% else %}
+
+ USERS ACTIVITY
+
- {% include 'recent-activities.html' %}
+ {% include 'recent-activities.html' %}
+
+ {% endif %}
- {% endif %}
diff --git a/osinaweb/templates/main.html b/osinaweb/templates/main.html
index 0712544b..c5da7d53 100644
--- a/osinaweb/templates/main.html
+++ b/osinaweb/templates/main.html
@@ -8,7 +8,7 @@
{% block title %} Osina {% endblock %}
-
+
@@ -340,160 +340,18 @@
-
-
+
+
- 14 Connected
-
+ Tickets
+ 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
{% block content %}
diff --git a/osinaweb/templates/popup_modals/showpoints-modal.html b/osinaweb/templates/popup_modals/showpoints-modal.html
index ac8b1e04..0ac9152a 100644
--- a/osinaweb/templates/popup_modals/showpoints-modal.html
+++ b/osinaweb/templates/popup_modals/showpoints-modal.html
@@ -22,31 +22,98 @@
{% for point in points %}
{% if point.status == 'Not Completed' %}
- |