diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3 index 3586da5b..c961face 100644 Binary files a/osinaweb/db.sqlite3 and b/osinaweb/db.sqlite3 differ diff --git a/osinaweb/input.css b/osinaweb/input.css index 81f3fbb7..8a5242bc 100644 --- a/osinaweb/input.css +++ b/osinaweb/input.css @@ -203,4 +203,9 @@ to { transform: translateY(0); } +} + +/* TO HIGHLIGHT THE SELECTED EMOJI CATEGORY */ +.selectedEmojiCategory { + background-color: rgba(128, 128, 128, 0.265); } \ No newline at end of file diff --git a/osinaweb/osinacore/__pycache__/urls.cpython-311.pyc b/osinaweb/osinacore/__pycache__/urls.cpython-311.pyc index bcdf921c..a0bcfc07 100644 Binary files a/osinaweb/osinacore/__pycache__/urls.cpython-311.pyc and b/osinaweb/osinacore/__pycache__/urls.cpython-311.pyc differ diff --git a/osinaweb/osinacore/__pycache__/views.cpython-311.pyc b/osinaweb/osinacore/__pycache__/views.cpython-311.pyc index 4534c9c0..8612f561 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/osinacore/add/__pycache__/views.cpython-311.pyc b/osinaweb/osinacore/add/__pycache__/views.cpython-311.pyc index 005f8b41..1ec6a402 100644 Binary files a/osinaweb/osinacore/add/__pycache__/views.cpython-311.pyc and b/osinaweb/osinacore/add/__pycache__/views.cpython-311.pyc differ diff --git a/osinaweb/osinacore/add/views.py b/osinaweb/osinacore/add/views.py index 755a2909..18ee3ef9 100644 --- a/osinaweb/osinacore/add/views.py +++ b/osinaweb/osinacore/add/views.py @@ -523,7 +523,6 @@ def add_daily_report(request): if request.method == 'POST': text = request.POST.get('text') current_datetime = datetime.now() - date = datetime.now().date() time = current_datetime.strftime("%I:%M %p") try: staff_profile = StaffProfile.objects.get(user=request.user) @@ -531,28 +530,23 @@ def add_daily_report(request): # Handle the case where a StaffProfile does not exist for the user staff_profile = None - dailyreport = DailyReport( - text = text, - date = date, - time = time, - staff = staff_profile + text=text, + date=today, + time=time, + staff=staff_profile ) dailyreport.save() - return redirect('dailyreports') context = { 'statuses': statuses, - - } return render(request, 'add_templates/add-daily-report.html', context) - def add_projecttype_modal(request, *args, **kwargs): if request.method == 'POST': name = request.POST.get('name') diff --git a/osinaweb/osinacore/templates/add-edit-main.html b/osinaweb/osinacore/templates/add-edit-main.html new file mode 100644 index 00000000..ce39d50d --- /dev/null +++ b/osinaweb/osinacore/templates/add-edit-main.html @@ -0,0 +1,656 @@ +{% load static %} + + + + + + + {% block title %} Osina {% endblock %} + + + + + + + + + {% if user_offline %} +
+
+
+

You are Currently Offline

+
+ + +
+
+ {% endif %} + + +
+ +
+ +
+ +
+ +
+ + +
+ +
+ +
+
+ + +
+ + + {% if user.is_superuser %} +
+
+
+ +

Accounts

+
+
+ + +
+
+ + +
+ {% endif %} + + +
+
+
+ +

My Work

+
+
+ + +
+
+ + +
+ + +
+
+ +

Support

+
+
+ +
+
+ + + + {% if user.is_superuser %} +
+
+
+ +

Billing

+
+
+ + +
+
+
+ {% endif %} + + +
+
+
+ +

Utilities

+
+
+ + +
+
+ + +
+ + +
+ +

Activity

+
+ +
+
+ + +
+
+
+ Ositcom Logo +

Powered By OSITCOM

+
+

Copyrights © 2024 All Rights Reserved

+
+
+
+ + + + + + +
+ +
+
+
+
+
+
+
+ + +
+ +
+
+
+
+ user-image +
+
+ +
+

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

+ + +
+
+ + + +
+
+ + + +
+ + + + +
+
+
+
+
+ + +
+ + + +
+
+
+
+

Recent Status

+
+ + +
+
+ {% include 'recent-status.html' %} +
+
+ +
+
+
+

Tasks

+ +
+
+

{{total_tasks}}

+
+
+
+ +
+
+
+

Projects

+ +
+
+

2

+
+
+
+ +
+
+
+

Tickets

+ +
+
+

2

+
+
+
+
+ + + {% block content %} + replace me + {% endblock content %} + + + +
+
+
+ Ositcom Logo +

Powered By OSITCOM

+
+

Copyrights © 2024 All Rights Reserved

+
+
+
+
+ + + + + + + + + + + + + + \ No newline at end of file diff --git a/osinaweb/osinacore/templates/add_templates/add-business.html b/osinaweb/osinacore/templates/add_templates/add-business.html index 63f901eb..718c666b 100644 --- a/osinaweb/osinacore/templates/add_templates/add-business.html +++ b/osinaweb/osinacore/templates/add_templates/add-business.html @@ -1,4 +1,4 @@ -{% extends "main.html" %} +{% extends "add-edit-main.html" %} {%load static%} {% block content %} @@ -93,13 +93,12 @@ class="w-fit py-1 px-5 bg-osiblue rounded-md outline-none text-white border border-osiblue text-xl cursor-pointer hover:bg-white hover:text-osiblue duration-300">Save - - + - - {% endblock content %} \ No newline at end of file diff --git a/osinaweb/osinacore/templates/add_templates/add-customer.html b/osinaweb/osinacore/templates/add_templates/add-customer.html index c365a370..f93b3382 100644 --- a/osinaweb/osinacore/templates/add_templates/add-customer.html +++ b/osinaweb/osinacore/templates/add_templates/add-customer.html @@ -1,12 +1,13 @@ -{% extends "main.html" %} +{% extends "add-edit-main.html" %} {%load static%} {% block content %}
-
+

Add Customer

+
{% csrf_token %}
@@ -303,10 +304,9 @@
-
- -
- - - - - - - - + + -