From 612bf8b1f70abd47fb046b23f36790b2c263755c Mon Sep 17 00:00:00 2001 From: nataly Date: Fri, 22 Mar 2024 16:50:01 +0200 Subject: [PATCH] New changes. --- osinaweb/db.sqlite3 | Bin 954368 -> 962560 bytes osinaweb/input.css | 5 + .../__pycache__/urls.cpython-311.pyc | Bin 5206 -> 5349 bytes .../__pycache__/views.cpython-311.pyc | Bin 22020 -> 22249 bytes .../add/__pycache__/views.cpython-311.pyc | Bin 25628 -> 25514 bytes osinaweb/osinacore/add/views.py | 14 +- .../osinacore/templates/add-edit-main.html | 656 +++++++++ .../templates/add_templates/add-business.html | 10 +- .../templates/add_templates/add-customer.html | 9 +- .../add_templates/add-daily-report.html | 6 +- .../templates/add_templates/add-epic.html | 6 +- .../templates/add_templates/add-project.html | 6 +- .../templates/add_templates/add-staff.html | 6 +- .../templates/add_templates/add-task.html | 8 +- .../details_templates/business-details.html | 418 +----- .../details_templates/customer-details.html | 569 ++------ .../details_templates/project-details.html | 1171 ++++++----------- .../details_templates/staff-details.html | 382 +----- .../details_templates/task-details.html | 737 ++++------- .../edit_templates/edit-business-type.html | 8 +- .../edit_templates/edit-business.html | 7 +- .../edit_templates/edit-customer.html | 8 +- .../templates/edit_templates/edit-epic.html | 9 +- .../edit_templates/edit-project-type.html | 7 +- .../edit_templates/edit-project.html | 8 +- .../edit_templates/edit-reference.html | 8 +- .../edit_templates/edit-staff-position.html | 6 +- .../templates/edit_templates/edit-staff.html | 7 +- .../templates/edit_templates/edit-tag.html | 6 +- .../templates/edit_templates/edit-task.html | 15 +- .../templates/epic-fetched-tasks.html | 307 ++--- osinaweb/osinacore/templates/index.html | 686 +++------- .../listing_pages/business-types.html | 406 +----- .../templates/listing_pages/businesses.html | 461 ++----- .../templates/listing_pages/customers.html | 504 ++----- .../listing_pages/daily-reports.html | 386 +----- .../templates/listing_pages/notes.html | 343 +---- .../listing_pages/project-types.html | 404 +----- .../templates/listing_pages/projects.html | 473 ++----- .../templates/listing_pages/references.html | 419 +----- .../listing_pages/staff-positions.html | 404 +----- .../templates/listing_pages/staffs.html | 505 ++----- .../templates/listing_pages/tags.html | 404 +----- .../templates/listing_pages/tasks.html | 818 +++--------- osinaweb/osinacore/templates/main.html | 233 +++- .../templates/project-open-tasks.html | 91 +- .../templates/recent-activities-page.html | 604 +++++++++ .../templates/recent-activities.html | 151 ++- .../osinacore/templates/recent-status.html | 35 +- .../templates/user-recent-activities.html | 1 - osinaweb/osinacore/urls.py | 1 + osinaweb/osinacore/views.py | 9 + osinaweb/static/dist/output.css | 64 +- osinaweb/static/images/.DS_Store | Bin 6148 -> 6148 bytes osinaweb/static/images/emojis/.DS_Store | Bin 0 -> 6148 bytes osinaweb/static/images/emojis/activities.png | Bin 0 -> 4081 bytes osinaweb/static/images/emojis/animal.png | Bin 0 -> 3576 bytes osinaweb/static/images/emojis/flags.png | Bin 0 -> 1703 bytes osinaweb/static/images/emojis/food.png | Bin 0 -> 2541 bytes osinaweb/static/images/emojis/lightbulb.png | Bin 0 -> 2498 bytes osinaweb/static/images/emojis/smiley.png | Bin 0 -> 2885 bytes osinaweb/static/images/emojis/travel.png | Bin 0 -> 2035 bytes osinaweb/static/images/icons/expand.png | Bin 0 -> 1009 bytes osinaweb/static/images/icons/useractivity.png | Bin 0 -> 5700 bytes osinaweb/static/images/usersactivity.png | Bin 1527 -> 0 bytes osinaweb/static/js/emoji-picker.js | 38 + osinaweb/static/js/pop-modals.js | 1 - osinaweb/static/js/switch-status.js | 17 + 68 files changed, 3897 insertions(+), 7960 deletions(-) create mode 100644 osinaweb/osinacore/templates/add-edit-main.html create mode 100644 osinaweb/osinacore/templates/recent-activities-page.html create mode 100644 osinaweb/static/images/emojis/.DS_Store create mode 100644 osinaweb/static/images/emojis/activities.png create mode 100644 osinaweb/static/images/emojis/animal.png create mode 100644 osinaweb/static/images/emojis/flags.png create mode 100644 osinaweb/static/images/emojis/food.png create mode 100644 osinaweb/static/images/emojis/lightbulb.png create mode 100644 osinaweb/static/images/emojis/smiley.png create mode 100644 osinaweb/static/images/emojis/travel.png create mode 100644 osinaweb/static/images/icons/expand.png create mode 100644 osinaweb/static/images/icons/useractivity.png delete mode 100644 osinaweb/static/images/usersactivity.png create mode 100644 osinaweb/static/js/emoji-picker.js create mode 100644 osinaweb/static/js/switch-status.js diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3 index 3586da5b70383a32648297e3f8795e6474b8c6a1..c961face7a23255dab71ea80f75b407428e9fa07 100644 GIT binary patch delta 3928 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 E3msdjA^-pY delta 1486 zcmZ`(ZEO@p7@oQPxbF65wg}olp;a1qqS1cRjAxvwZYu zdxy~q3H?DM#oDZC2_9)A5`O@_!jMQb(L^v2sTzSl;{6~JW1t2bB%s78s38G%@;*D8 zdGbE**KB{*>Q7rk1ti44ph^;0_hcQQS(v(tMVtcon~)X}*DU zoFnNtAD$})@wSI~Nw;S+J3{mM6xo+4Rs{Gv9J&9BAT%%-lo02Ta8KfCXYzyvwlgg(VuiiJ0?NOgV=p)^MA=Q17?AzP zg*`7I%IZa9k7<85{~S7l#?Vpp1-g!|p(|(#eT`0_kJ0-yst;YPvy|3&?4q#6!Lkg1 z*aq4onfOYtHg6wd>jBF6|0aE5Nq7J^CoIt4NmKLHaIKPsf3fP|+}I*-YB)s8rE zRoO6gDq0HW3sq0@OiMQ{ z&7fl=8-_|F;6XvzJ0=I{tgVYgp5j)qbiY@ZWm%U2V85Mp%RlmKPbv6$!PHd0Mo*5} zX&259(@12~l4Y-~7^-g2gEyb)`#++l`vR2M^z@LaLps&6*U%I?yOdY{P-)AolJQ8% zH09ag;IozfB^s(iJup|Fsia$~pN39qU3ju7m)7UugRde|H03yf%3xXDz718e(Dts@ zPNh4(E7lv0#*Ef&iDaJ{N+lCL$wZ>VwEIK&bZ1Sp(b}+e*D9s2Gg`lLv+U`S*9V$f zgB`WWmFu@wx2Ad&B^r%XH>Wms8qM90+DR|C=2mn|S1h0ArN7Q4b^Bhc+Ge(!kz`vq zqzBY^G7)*BwMUP(B|5v!zP@wD{K)atg~HNFkK>YBCn v9=WD^mASpMto^i=&@A`l6LI7oPM2Tv8F-ezXrt&CE)#2_l-5lZ4g zYKl}Q@8a9SNtOvI0?8RdAn)x2vu}ghf54=y zFi4Fpn2Z$$sjLT+3xyRmKt@I}f*o>!Q)z+g6%~gI?y(nG;x4kpU15p)5X}fu5yLpy zM^HjD7R<<>u^YHQ6in6?QDt!j GMhXD460%nS delta 588 zcmZ`$&ubGw6rNdLqFcM&?54F1W)o|zX{HLAvO!Di9yH(&vN;qQiFgpYw&|gVmKH3i zJqAzF$stGaps9LLTEV};(<}@W)_b=cpo3{d+&Sm-D~1+_mI!?M+ntu4sjPZ} zD_O9GbPrp*$ZT!D0KE_Iamgvm%20OgCz!n<}!Wcphp;*%$ z>;F3PgNPS=Rtp(4V`y?{ijL~oKPNUZ!lT{Y?rv|LpP&12mfw8HY|6$RxFi4c6en_| A82|tP diff --git a/osinaweb/osinacore/__pycache__/views.cpython-311.pyc b/osinaweb/osinacore/__pycache__/views.cpython-311.pyc index 4534c9c0c2452777a44843442efb9b34c2a2bee8..8612f561f6ca00d3bdac840b3e27c2d60f133fe6 100644 GIT binary patch delta 549 zcmYjOS!h#16rD5KY9Lx^X!Fu4`EY5BFQJuaTO}xNNVIKIM5-S(<~?iNC@&8csWcx! zL=Y(h(I0U^Dx!jNzog=VAA$?wQd~eq1yQ6D0&1aDytRTJxaVBvp35+2ikI=_3VauQ zKCfU@j!u{_27MY%UYl=9hY=~N(^6|Ny@p;CLu|M->H34stwyvnlbZ}grR=ayunU-?oR=mXkP7737fVB3cvt;)b;~MXiNQ9CrY$7 zblZVDR5j-n@RUBxT`%#LVvP@gQ5p{q0%LS6avX5eEd2mbO{M5|pn)c0T|kUdO{;(w zDm5<#R?wqGkAWneiVp+b)V;(5WGT~EDEd9bjKZYEf4A&Gm71@5U-ZHc1UR%#( z?cBbcoip=#U#8cL?y&dlwvy}&ODn=+tz*hdrclUQ$nv^&YP09xW=~(n-)mamcsk0L z=VxS&`xX9?1(s3)ml&9BJ;S6*`pQFZ`$ esgMq;K>8j3+gSRR^sj*%D^V8zv0q)^nEVZOy`aJX delta 376 zcmWkpODMx}0N(eT*(`sO=eQ8^n5~WG-8gWW*I3~uY+jMt5+^y3?W@p-K1ZLTgzOThTW3q05OFn1U3*6I@dkVY}`61ww(i{YI%(RRF zv7EQ|0BO|PJb;yL_8Ops^M%DgHLr>;02h}WyFfcTO7uV%drO@H16(Oj6`0~dWwO8w zZ=BD-A`h!mbXenE?U@dbT&wc}CsZ1iA*Z|5YPY2J}2`5rB=So;@L4kPEGK|0TI~hyVZp diff --git a/osinaweb/osinacore/add/__pycache__/views.cpython-311.pyc b/osinaweb/osinacore/add/__pycache__/views.cpython-311.pyc index 005f8b41adb2630b75060c10e84ca0ffb6892297..1ec6a402f5672369cfbfa63298f296a427cfc168 100644 GIT binary patch delta 534 zcmbPpf^pSxM!w~|yj%=GAUNx9>V4OZd`SU}R+9?@g!xLCLBbG_#WY#aK}?{Qse}zC z#K4fnGFjeF&b)>(3ocm0w1#mR69dC)AclZi<{E}9b{H>(DH|+Pw5MjWr;Orc14RMW zT9y(KhRG8H^;lVJSQqe2E)*4=94#dv$i~S~A_db3w#`RIZn8v>EF=45vmj-2_DF_2 zmU4y)=17Ke#u9mi${Lm$rW&>y_BCwFSb$CeVhE_^sNq;3Fj>%6Y4WBZWpUNXYpANnQ-1Lod>8rEukfp1 z;86d-#=t2&!Q%rn6F*yn`&Tvw9-#^97o;5ys9)svy29;sfyJv>2x!qEQB@~vhC|kZ z&iu@W`51xZM$^p&k%~-guE20DE}k3{uD*F+v;h-i z+xM!w~|yj%=G(4hJ^mBno%Us3>L$K=8QVKyd)8m279$$}1Ila+1s@^%~*p{&XZ3bef&73uylO2NG#aS{LYq?5PVd6knGNf?Ua7~^U)H~TA*p88V za#pZDFL#jwP(=~YZ45=+lNSb?uyO;L3X^XJYYRCt0z-k}2Dea;O@qq~9hH!EMCPR%MaP8Ix8_8RuXhJV?J!k2qY&jj24@$ z758|uP1s6Coyq?rbTz|T#^TL$O9eqcZ%y%;CEC8q!YOJ{zf 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 @@
-
- -
- - - - - - - - + + -