diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3 index 5920e524..703801d6 100644 Binary files a/osinaweb/db.sqlite3 and b/osinaweb/db.sqlite3 differ diff --git a/osinaweb/osinacore/__pycache__/views.cpython-311.pyc b/osinaweb/osinacore/__pycache__/views.cpython-311.pyc index eceaf45d..205ed401 100644 Binary files a/osinaweb/osinacore/__pycache__/views.cpython-311.pyc and b/osinaweb/osinacore/__pycache__/views.cpython-311.pyc differ diff --git a/osinaweb/osinaweb/__pycache__/urls.cpython-311.pyc b/osinaweb/osinaweb/__pycache__/urls.cpython-311.pyc index 8215dd62..cbef19a4 100644 Binary files a/osinaweb/osinaweb/__pycache__/urls.cpython-311.pyc and b/osinaweb/osinaweb/__pycache__/urls.cpython-311.pyc differ diff --git a/osinaweb/static/dist/output.css b/osinaweb/static/dist/output.css index a04e98e3..4345e49e 100644 --- a/osinaweb/static/dist/output.css +++ b/osinaweb/static/dist/output.css @@ -925,10 +925,6 @@ video { width: 20%; } -.w-\[200px\] { - width: 200px; -} - .w-\[220px\] { width: 220px; } @@ -949,10 +945,6 @@ video { width: 25px; } -.w-\[270px\] { - width: 270px; -} - .w-\[3\%\] { width: 3%; } @@ -1058,6 +1050,10 @@ video { width: 100%; } +.min-w-full { + min-width: 100%; +} + .max-w-2xl { max-width: 42rem; } @@ -1198,6 +1194,17 @@ video { row-gap: 0.5rem; } +.divide-y > :not([hidden]) ~ :not([hidden]) { + --tw-divide-y-reverse: 0; + border-top-width: calc(1px * calc(1 - var(--tw-divide-y-reverse))); + border-bottom-width: calc(1px * var(--tw-divide-y-reverse)); +} + +.divide-gray-200 > :not([hidden]) ~ :not([hidden]) { + --tw-divide-opacity: 1; + border-color: rgb(229 231 235 / var(--tw-divide-opacity)); +} + .overflow-hidden { overflow: hidden; } @@ -1325,6 +1332,11 @@ video { border-color: rgb(21 128 61 / var(--tw-border-opacity)); } +.border-orange-500 { + --tw-border-opacity: 1; + border-color: rgb(249 115 22 / var(--tw-border-opacity)); +} + .border-orange-700 { --tw-border-opacity: 1; border-color: rgb(194 65 12 / var(--tw-border-opacity)); @@ -1405,6 +1417,11 @@ video { background-color: rgb(156 163 175 / var(--tw-bg-opacity)); } +.bg-gray-50 { + --tw-bg-opacity: 1; + background-color: rgb(249 250 251 / var(--tw-bg-opacity)); +} + .bg-gray-500 { --tw-bg-opacity: 1; background-color: rgb(107 114 128 / var(--tw-bg-opacity)); @@ -1733,6 +1750,10 @@ video { text-transform: uppercase; } +.leading-8 { + line-height: 2rem; +} + .text-blue-500 { --tw-text-opacity: 1; color: rgb(59 130 246 / var(--tw-text-opacity)); diff --git a/osinaweb/templates/add_pages/create-project.html b/osinaweb/templates/add_pages/create-project.html index d95a091d..867f88da 100644 --- a/osinaweb/templates/add_pages/create-project.html +++ b/osinaweb/templates/add_pages/create-project.html @@ -18,7 +18,7 @@ class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md text-gray-500"> {% for customer in customers %} - + {% endfor %} diff --git a/osinaweb/templates/add_pages/createtask-project.html b/osinaweb/templates/add_pages/createtask-project.html index 9e05c583..2cf31093 100644 --- a/osinaweb/templates/add_pages/createtask-project.html +++ b/osinaweb/templates/add_pages/createtask-project.html @@ -43,7 +43,7 @@ class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md text-gray-500"> {% for staff in staffs %} - + {% endfor %} diff --git a/osinaweb/templates/details_pages/project-details.html b/osinaweb/templates/details_pages/project-details.html index 1f56fe68..5a65ced2 100644 --- a/osinaweb/templates/details_pages/project-details.html +++ b/osinaweb/templates/details_pages/project-details.html @@ -128,13 +128,13 @@

Client: {{project.customer.first_name}} - {{project.customer.last_name}}

+ class="text-slate-800 text-xl font-semibold">{{project.customer.user.first_name}} + {{project.customer.user.last_name}}

Project Manager: {{project.manager.first_name}} + class="text-slate-800 text-xl font-semibold">{{project.manager.user.first_name}} {{project.manager.last_name}}

@@ -143,7 +143,7 @@

Member(s): {% for member in project.members.all %} - {{member.first_name}} {{member.last_name}} {% if not forloop.last %}, {% endif %} + {{member.user.first_name}} {{member.user.last_name}} {% if not forloop.last %}, {% endif %} {% endfor %}

diff --git a/osinaweb/templates/listing_pages/businesses.html b/osinaweb/templates/listing_pages/businesses.html index 964a230f..31ef27a6 100644 --- a/osinaweb/templates/listing_pages/businesses.html +++ b/osinaweb/templates/listing_pages/businesses.html @@ -81,58 +81,69 @@ -
-
- -
-
-

Name

-
-
-

Business Type

-
-
-

Financial number

-
-
-

Actions

-
-
- -
- +
+ + + + + + + + + + + + + + {% for business in businesses %} -
-
-

{{business.name}}

-
-
-

{{business.business_type}}

-
-
-

{{business.financial_number}}

-
-
- -
- -
- - -
- +
+ + + + + + + + {% endfor %} - - - + +
+ Name + + Business Type + + Financial Number + + Actions +
+

{{business.name}}

+ 		+

{{business.business_type}}

+ 		+

{{business.financial_number}}

+ 		+
+ +
+ +
+ + +
+ +
+ +
+
- -
-
-
- +
diff --git a/osinaweb/templates/listing_pages/customers.html b/osinaweb/templates/listing_pages/customers.html index 23d2b28f..741dbe39 100644 --- a/osinaweb/templates/listing_pages/customers.html +++ b/osinaweb/templates/listing_pages/customers.html @@ -66,7 +66,8 @@
-
@@ -80,86 +81,93 @@
-
-
+
+ -
-
-

First Name

-
-
-

Last Name

-
-
-

User

-
-
-

Status

-
-
-

Business

-
-
- Actions -
-
+ + + + + + + + + -
- {% for customer in customers %} +
-
-
-

{{customer.user.first_name}}

-
-
-

{{customer.user.last_name}}

-
-
-

{{customer.user.username}}

-
+ {% for customer in customers %} +
+ + + + {% if customer.status == 'Active' %} -
+
{% endif %} + {% if customer.status == 'Terminated' %} -
+
{% endif %} + {% if customer.status == 'Suspended' %} -
+
{% endif %} -
-

{{customer.business}}

-
-
- -
- -
- - -
- + +
+ + + {% endfor %} - - - + +
+ Customer + + User + + Status + + Business + + Actions +
+

{{customer.user.first_name}} + {{customer.user.last_name}}

+ 		+

{{customer.user.username}}

+

{{customer.status}}

- +

{{customer.status}}

- +

{{customer.status}}

- + 		+

{{customer.business}}

+ 		+
+ +
+ +
+ + + +
+ +
+ + +
+
- -
-
-
- +
@@ -168,7 +176,7 @@

USERS ACTIVITY

- {% include 'recent-activities.html' %} + {% include 'recent-activities.html' %}
diff --git a/osinaweb/templates/listing_pages/daily-reports.html b/osinaweb/templates/listing_pages/daily-reports.html index c99e0d47..714b9bab 100644 --- a/osinaweb/templates/listing_pages/daily-reports.html +++ b/osinaweb/templates/listing_pages/daily-reports.html @@ -89,7 +89,8 @@ class="w-full flex justify-between items-center h-[60px] border-b border-gray-300 rounded-t-md">

Report By {{report.staff.first_name}} {{report.staff.last_name}} On {{report.staff.user.first_name}} + {{report.user.staff.last_name}} On {{report.date}}

@@ -98,11 +99,8 @@
-
-

- {{report.text}} -

+
+ {{ report.text|linebreaks }}
@@ -111,7 +109,7 @@ {% endfor %} - +
@@ -120,7 +118,7 @@

USERS ACTIVITY

- {% include 'recent-activities.html' %} + {% include 'recent-activities.html' %}
diff --git a/osinaweb/templates/listing_pages/project-types.html b/osinaweb/templates/listing_pages/project-types.html index c436c164..bb3ec194 100644 --- a/osinaweb/templates/listing_pages/project-types.html +++ b/osinaweb/templates/listing_pages/project-types.html @@ -77,41 +77,47 @@ -
-
+
+ -
-
-

Project Type

-
-
- Actions -
-
+ + + + + + -
+
{% for type in projecttypes %} -
-
-

{{type.name}}

-
-
- -
- +
+ + + + {% endfor %} - - + +
+ Project Type + + Actions +
+

{{type.name}}

+ 		+
+ +
+ +
+ +
+
- -
-
-
- +
diff --git a/osinaweb/templates/listing_pages/projects.html b/osinaweb/templates/listing_pages/projects.html index b2df1a25..d4a63fa4 100644 --- a/osinaweb/templates/listing_pages/projects.html +++ b/osinaweb/templates/listing_pages/projects.html @@ -62,7 +62,7 @@
-
+
@@ -89,86 +89,99 @@
-
-
+ +
+ -
-
-

#

-
-
-

Project

-
-
-

Client

-
-
-

Status

-
-
-

Action

-
-
+ + + + + + + + + -
+
{% for project in projects %} -
-
-

{{project.project_id}}

-
-
-

{{project.name}}

-
-
-

{{project.customer}}

-
+
+ + + + + + {% if project.status == 'Completed' %} -
+
{% endif %} + + {% if project.status == 'Cancelled' %} -
+
{% endif %} + + {% if project.status == 'Active' %} -
+
{% endif %} + {% if project.status == 'Pending' %} -
+
{% endif %} -
- -
- -
- - -
- + +
+ {% endfor %} - - - + +
+ # + + Project + + Client + + Status + + Actions +
+

{{project.project_id}}

+ 		+

{{project.name}}

+ 		+

{{project.customer}}

+

{{project.status}}

- +

{{project.status}}

- +

{{project.status}}

- +

{{project.status}}

- + 		+
+ +
+ +
+ + +
+ +
+ +
+
- -
-
-
- +
@@ -178,7 +191,7 @@

USERS ACTIVITY

- {% include 'recent-activities.html' %} + {% include 'recent-activities.html' %}
diff --git a/osinaweb/templates/listing_pages/references.html b/osinaweb/templates/listing_pages/references.html index 591b17d2..70aae6ee 100644 --- a/osinaweb/templates/listing_pages/references.html +++ b/osinaweb/templates/listing_pages/references.html @@ -65,59 +65,69 @@
-
+ class="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 addReferenceButton" + data-modal-url="{% url 'addreference' %}">Add + Reference
-
-
+
+ -
-
-

Reference

-
-
-

Date

-
-
- Actions -
-
+ + + + + + + -
+
{% for reference in references %} -
-
-

{{reference.name}}

-
-
-

{{reference.formatted_date}}

-
-
- -
- +
+ + + + + + {% endfor %} - - + +
+ Reference + + Date + + Actions +
+

{{reference.name}}

+ 		+

{{reference.formatted_date}}

+ 		+
+ +
+ +
+ +
+
- -
-
-
- +
@@ -127,7 +137,7 @@

USERS ACTIVITY

- {% include 'recent-activities.html' %} + {% include 'recent-activities.html' %}
diff --git a/osinaweb/templates/listing_pages/staff-positions.html b/osinaweb/templates/listing_pages/staff-positions.html index 62996121..2c46dbb7 100644 --- a/osinaweb/templates/listing_pages/staff-positions.html +++ b/osinaweb/templates/listing_pages/staff-positions.html @@ -80,41 +80,47 @@ -
-
+
+ -
-
-

Position

-
-
- Actions -
-
+ + + + + + -
+
{% for position in staffpositions %} -
-
-

{{position.name}}

-
-
- -
- +
+ + + + {% endfor %} - - + +
+ Position + + Actions +
+

{{position.name}}

+ 		+
+ +
+ +
+ +
+
- -
-
-
- +
diff --git a/osinaweb/templates/listing_pages/staffs.html b/osinaweb/templates/listing_pages/staffs.html index 849f4d77..5faf28f4 100644 --- a/osinaweb/templates/listing_pages/staffs.html +++ b/osinaweb/templates/listing_pages/staffs.html @@ -80,61 +80,66 @@ -
-
+
+ -
-
-

Full Name

-
-
-

Email

-
-
- Actions -
-
+ + + + + + + -
+
- {% for staff in staffs %} -
-
-
+
+ + + + + + {% endfor %} - - + +
+ Name + + Email + + Actions +
+
user-image
-
-

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

-
- -
-

{{staff.user.email}}

-
-
- -
- +
+
+

{{staff.user.email}}

+ 		+
+ +
+ +
+ + +
+ +
+ +
+
- - -
- -
- -
-
-
- +
diff --git a/osinaweb/templates/listing_pages/tags.html b/osinaweb/templates/listing_pages/tags.html index 62438c9a..7fd8828a 100644 --- a/osinaweb/templates/listing_pages/tags.html +++ b/osinaweb/templates/listing_pages/tags.html @@ -77,41 +77,47 @@ -
-
+
+ -
-
-

Tag Name

-
-
- Actions -
-
+ + + + + + -
+
{% for tag in tags %} -
-
-

{{tag.name}}

-
-
- -
- +
+ + + + {% endfor %} - - + +
+ Tag Name + + Actions +
+

{{tag.name}}

+ 		+
+ +
+ +
+ +
+
- -
-
-
- +
diff --git a/osinaweb/templates/listing_pages/tasks.html b/osinaweb/templates/listing_pages/tasks.html index aafd8af1..996e9757 100644 --- a/osinaweb/templates/listing_pages/tasks.html +++ b/osinaweb/templates/listing_pages/tasks.html @@ -61,7 +61,7 @@
-
+
@@ -102,44 +102,79 @@ {% for task in my_tasks %} -
-
+ {% for task in my_tasks %} +
+
-
- {% if task.status == 'Open' %} -
-

{{task.name}}

-
- {% endif %} - {% if task.status == 'Working On' %} -
-

{{task.name}}

-
- {% endif %} - {% if task.status == 'Closed' %} +
-

{{task.name}}

-
- {% endif %} - -
-

{{task.status}}

+ class="flex justify-center items-center border-r border-b border-gray-200 bg-slate-600 rounded-tl-md text-xl text-white font-semibold"> +

{{task.name}}

-
-

{{task.formatted_start_date}}

-
-
-

{{task.formatted_end_date}}

+ +
+ {% if task.status == 'Closed' %} +
+

{{task.status}}

+
+ {% endif %} + + {% if task.status == 'Open' %} +
+

{{task.status}}

+
+ {% endif %} + + {% if task.status == 'Working On' %} +
+

{{task.status}}

+
+ {% endif %} + + {% if task.status == 'Closed' %} +
+

{{task.formatted_start_date}}

+
+ {% endif %} + + {% if task.status == 'Open' %} +
+

{{task.formatted_start_date}}

+
+ {% endif %} + + {% if task.status == 'Working On' %} +
+

{{task.formatted_start_date}}

+
+ {% endif %} + + + {% if task.status == 'Closed' %} +
+

{{task.formatted_end_date}}

+
+ {% endif %} + + {% if task.status == 'Open' %} +
+

{{task.formatted_end_date}}

+
+ {% endif %} + + {% if task.status == 'Working On' %} +
+

{{task.formatted_end_date}}

+
+ {% endif %}
+
-
+
-
+
@@ -154,8 +189,8 @@

Assigned To:

-

{{task.assigned_to.first_name}} - {{task.assigned_to.last_name}}

+

{{task.assigned_to.user.first_name}} + {{task.assigned_to.user.last_name}}

@@ -175,44 +210,53 @@
-
+
+ class="p-2 border border-gray-200 text-base h-[70px] bg-gray-100 text-gray-500">Close + + + - + + + class="w-full p-2 border border-gray-200 text-base h-[70px] bg-gray-100 text-gray-500">Edit + + - + + + class="w-full p-2 border border-gray-200 text-base h-[70px] bg-gray-100 text-gray-500">Details +
{% endfor %} + {% endfor %}
diff --git a/osinaweb/templates/main.html b/osinaweb/templates/main.html index 8c7c0d76..0137da2b 100644 --- a/osinaweb/templates/main.html +++ b/osinaweb/templates/main.html @@ -291,7 +291,7 @@
-
+

Connected Users