From d7d01e31b1c7eff0fa6b35da61cc519c295746da Mon Sep 17 00:00:00 2001 From: nataly Date: Wed, 24 Jan 2024 15:42:59 +0200 Subject: [PATCH] Minor changes, delete point. --- osinaweb/db.sqlite3 | Bin 643072 -> 643072 bytes .../__pycache__/views.cpython-311.pyc | Bin 73424 -> 74544 bytes osinaweb/osinacore/views.py | 30 +++++++++++++++ .../osinaweb/__pycache__/urls.cpython-311.pyc | Bin 13013 -> 13345 bytes osinaweb/osinaweb/urls.py | 6 ++- osinaweb/static/dist/output.css | 18 +++++++-- osinaweb/static/js/pop-modals.js | 2 + .../details_pages/business-details.html | 5 ++- .../details_pages/customer-details.html | 2 +- .../details_pages/project-details.html | 2 +- .../details_pages/staff-details.html | 2 +- .../templates/details_pages/task-details.html | 27 +++++++++++++- osinaweb/templates/index.html | 2 +- .../listing_pages/business-types.html | 2 +- .../templates/listing_pages/businesses.html | 2 +- .../templates/listing_pages/customers.html | 2 +- .../listing_pages/daily-reports.html | 2 +- osinaweb/templates/listing_pages/notes.html | 2 +- .../listing_pages/project-types.html | 2 +- .../templates/listing_pages/projects.html | 2 +- .../templates/listing_pages/references.html | 2 +- .../listing_pages/staff-positions.html | 2 +- osinaweb/templates/listing_pages/staffs.html | 2 +- osinaweb/templates/listing_pages/tags.html | 2 +- osinaweb/templates/listing_pages/tasks.html | 2 +- osinaweb/templates/login.html | 2 +- .../popup_modals/showpoints-modal.html | 35 ++++++++++++------ 27 files changed, 120 insertions(+), 37 deletions(-) diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3 index 051849d6268c4feff4a49da0b290dd23410560d5..ca83b831bf62f566ca30c5a87f246a01392d043e 100644 GIT binary patch delta 824 zcmZozpx&@ReS$P&_e2?I#_o*?XXP2sZ`M<=<7E`soU5C_D8b4oqRgz#lwX{gmzbPi zlp0@1Bcm{C}fpI%j1l3tQmP*|9n zZ(wFpnr>>8lx~`oXqldq@88V2bUW)(#{XW-zHIBJvwvWm$;7s9v!enJ+w`;F7a?TndllA z>Kd7V?NkWxWnf^Kz#yy$R$iQz5}sd_otc-e;Gc(Gt)R3zBTx$i#AJgyP6kDY-jw3B zqO_FaB02v?CZPQgRViu3=_$qOe)%N|a5u=xG_r6qh(i<Kz0B zJN}>i&-tHk7x=(>onMlTnUP6}p^255kx{80=l~uih)By8HWmkFUFM0?*&WzI*_b~t zA7Y*e3}Ag`N4+TmYz&r)vYZG{St-EWnU;zg78by;(4NB2#$XK801db42ff%tOb}tE zK825sK^x6LV4$IzWDYc`UCMF P*8n3eZr?MP)5Qn?K+NYc delta 456 zcmZozpx&@ReS$P&@kAMC#^Q|$XXP0$Y}Qk-<7MRCoU5C_D8a^`pZs76OEc%v?VL*)e|s_eu$`UG z{(*7kW=92Gw(0A>G4i(G`o;*vOhC-M{nj@Y;V4041p^B!BV#KQV?9e#6LWL(?f(K; znfuupfIxtOVYDxYj(22mI$2obHQ3ePXf&df_!@XwPnGB7gMH8jvQFfsrd zX$n!PBMMQO1_XH3a>3pBfpyDtg%3bC9{Iqk%r993l#r0E29iRuRX~zQt`bPH$yRJ( zV{u^CVv(B8?!Xob43>S&?NTmmK+L{f%7x?AZsrX3o~`Vhr>D+{u^FXurR29TECWid2FZg#R3lKd z07JAXr7)O5v#42xeYy%eqmLLfOg)fh0b&sU^NY!WZ{;TUt+k&#pF@;cq=sd(;8Hb{ z8s;oknCe>A5?&aafgy#thBcjW4a+hnpbLN)0&3Yx_$NP1l&S|>$m&OPXhhK}5Q`5)hyw{t_96`sdl5)0SZWQ3I|IaB0wR_I ziDGu3m;wY8X#&}|gi=y-QYA}L;|uaL^Gf1#^HUOYir9h1pJM|m&z#J^Rdc#DFQXLm z10k`=7dKjP(JKf%KyC&FK@l6!H3WU! zM;W<bQH%=_vd6(oxWFq(S@;jJCh*ePbPU#1QdbXSOhY+2xMRp$fP2W5kT@v~d|&_)ADJ1L1X|=iFo6VQ UfNT)U2qa~MBxN*RQ;u;t0L>=0bpQYW delta 181 zcmdmRjOD^!7QW@Yyj%=GaJguGD)XUV`EFn4`$FTXbxbX9>C7%GyOO} zqv-af+>8epS=pEv7|w0a;$?in$jSj^KinS9&v=-TjSI+r&$eAb5X9jDa{jVye<{Rx zl#z`O$l+$6ZotkMG@VV9QJS%FyOJp5PbN{2QAHp#ia?r+K$?p9rdvrcN^!{m*^EGk S6;Ih7C&BoKbNU1&#svTp^(zSg diff --git a/osinaweb/osinacore/views.py b/osinaweb/osinacore/views.py index 0cf2b9cd..c746c5fa 100644 --- a/osinaweb/osinacore/views.py +++ b/osinaweb/osinacore/views.py @@ -1739,6 +1739,36 @@ def delete_note_modal(request, note_id): return render(request, "delete_modals/delete-note-modal.html", context) +@login_required +def delete_point_modal(request, point_id, task_id): + task = get_object_or_404(Task, id=task_id) + point = get_object_or_404(Point, id=point_id) + + if request.method == 'POST': + point.delete() + + task_id_str = task.task_id + + showpoints_url = reverse('showpoints', args=[task_id_str]) + return HttpResponseRedirect(showpoints_url) + + + +@login_required +def delete_task_point_modal(request, point_id, task_id): + task = get_object_or_404(Task, id=task_id) + point = get_object_or_404(Point, id=point_id) + + if request.method == 'POST': + point.delete() + + task_id_str = task.task_id + + task_details_url = reverse('detailed-task', args=[task_id_str]) + return HttpResponseRedirect(task_details_url) + + + @login_required def delete_project_note_modal(request, note_id): note = get_object_or_404(Note, id=note_id) diff --git a/osinaweb/osinaweb/__pycache__/urls.cpython-311.pyc b/osinaweb/osinaweb/__pycache__/urls.cpython-311.pyc index fa089b971d9c1d7783d12a75b89420c2a7581cca..40406abf492315d53230847b14dbd7d69c808e6c 100644 GIT binary patch delta 1823 zcmZuxT~8ZF6t%tAV7?I)urV=q0Aus9fCZF<1_H!QN&-oM7BCPXu#^yNzG*QDj`HM) zhnNfxNKGpuMX9Ay3B(JDQZEEWMCF}TD&)$==iZ;^ChNg@?*RymIF&Hy`k`kt-RaG71KW`l84ZY$eKNfiD zmz|U+f=>4xzi@2meE}(8&`HTs>eNiU%AaTB&pWT582Ai+;RvSbbiTm&uiZNLn|)ix zY_h(D+_w}9RY$oTbF+ftxHK&-O0zRJ0*n5c@zH7GuoaeOzF!S`u(CM1aPwVn<_GU7 z`>!l-jQY9#jY1n#9%Z3AtW6r$RyfLw)zq;63gl_g#l-n8-uZkt(HBQEht6)CI*tiWn3rMpaM}bjBnu zf<_MfM`BAbeG>MLtLPqg-9*L4~7O zd)+m?w&66%vQ@{dwFgZU+GS{G(5{5kL~n&Qd7?t=?jFJp!eNC2JGeqDl~%Z_zD-W0 zW^6zhKv+X~ROtw5iw+uMi&pQJFwa%mH%nnohB*dv$`DWCr(`5j zKLfuqik9nf%b9~E);vhZRwx8z2r>vNV`!N|OSmAiv>A#HP$0u%GWI-8QbeoCkG@$V ziWbuxl6i7jG@BNXENWy4$uhYw=9|7i@+H~h0V_y?s*<#d%wtg9fD+4Sn&5liS|Mmk-J) zcxCW1@GAXi@R9GU^GyRt1~oE-YVUJk+!6Wwn=Rw?tt=h6x4} z${1S4DSTGP8R(jS5Y&(8Po$r47_mbSFi* Z06KkYcsaZrnPj=H1MU=d%x0)0K9={m=h5|NX|h z>wPkJl(IfADX|!|&3gM~s`}hxYnkac>o>LESzD8fsYR0^Wl5b{xT6F5rkyY0nZfYY z>n}|P!wYT4ZL`E+NG{I488oT?5~TA%LfaU6<}Fy*YMR2 z?LfY*?jaV}vv+7`1&ZMjl=GT-`FBHXVcV@X~hK zZqwcedl3fbIh+?oTSnroahSByjpbI&1zqjb)ad0Es$(olts|u;iFXY}#adQHrj*;f zIX{IcgD8inD3$gZw4E6jxBtsNEA29A)8g8!i+dupYlOlmgHaBn!X^Pbv4+YbvT5PK zEOj@vx0G$6(8QpLLz5_%WCgmm-Pqoh{d*LG41yej!m0IsTCyIfaO zZs~pIcHWdZzI;peOpH51wE05{-3+=pbPK-(0(c?0B!4bWp_4%;hfWccc3pnHEz`u+ zU~ZX07lSSiT_Pm?dVNLa2E7lD{Iw$<*~f%O_L25fxg^(R%m>wEOSwBtW5X0i7>sZj z5tohH^f#VLz5idZ6nm?5<@3svUQ{cn9($dbIakQ^XV-bKhYn0rm|-x(VMfgBnMXL` z53h_a^U2JMKB>mBq_I5lIcsE}_c3!@yDj{TCugV7%Al1)tJu&IwI^hgID9HR(Bn_| zWuV(H1AF|k*F_xM@fQ|u$}hY;v(BB(G%`S8kij5_L2+4M`lLSopt-+(uvf z=a8?~f10?1{t~IIvn$IeR>$|-2?e}qFs z+(Y0#0<_qXN%4wCda;*6oI#vJTx=k+SwP;h`Ui-7Qb6QeR7c+@Kh>Qq{uIqE6Zy67 ztdd3*B_$!7(r%VNdK(=ilR%=xFnoo(XYwnMG00R{sc21G9saU}9L zElHu7K{JPDaTWc(Lc+QI*wd@8JQQLKVjNQPNhgDhU)xGF7jp$531^1o^Tl9_aYdNg=@?!66~Wk(ekDmHV!z zf!qd#b_VSn+QlRSQw5-6zlc}1(C8qAAqGPnhQtj-rVB{;u!u*;==28ptKOo_pgT)W zHPk986gNq0gR0y@F-ImfXCB2W*=bPYYbfrT4cfP(kt)vpQeM?cI}_BLWacC{C&fA< ln}}>%Gex}2ohzZ{Ff)g_IV>JX;NeLTC4V-!;A`!p^bd;lIR5|u diff --git a/osinaweb/osinaweb/urls.py b/osinaweb/osinaweb/urls.py index 9a111e28..c675ad54 100644 --- a/osinaweb/osinaweb/urls.py +++ b/osinaweb/osinaweb/urls.py @@ -98,7 +98,11 @@ urlpatterns = [ path('deleteprojectmodal/', views.delete_project_modal, name='deleteprojectmodal'), path('deletetaskmodal/', views.delete_task_modal, name='deletetaskmodal'), path('deletenotemodal/', views.delete_note_modal, name='deletenotemodal'), - path('deleteprojectnotemodal/', views.delete_project_note_modal, name='deleteprojectnotemodal'), + path('deleteprojectnotemodal//', views.delete_project_note_modal, name='deleteprojectnotemodal'), + + path('deletepointmodal///', views.delete_point_modal, name='deletepointmodal'), + path('deletetaskpointmodal///', views.delete_task_point_modal, name='deletetaskpointmodal'), + #Save Urls path('save_note/', views.save_note, name='save_note'), diff --git a/osinaweb/static/dist/output.css b/osinaweb/static/dist/output.css index 1cf35dbe..694192fa 100644 --- a/osinaweb/static/dist/output.css +++ b/osinaweb/static/dist/output.css @@ -2311,6 +2311,11 @@ video { background-color: rgb(59 130 246 / var(--tw-bg-opacity)); } +.hover\:bg-red-500:hover { + --tw-bg-opacity: 1; + background-color: rgb(239 68 68 / var(--tw-bg-opacity)); +} + .hover\:bg-transparent:hover { background-color: transparent; } @@ -2366,12 +2371,12 @@ video { } @media (min-width: 650px) { - .s\:mt-\[-63px\] { - margin-top: -63px; + .s\:mt-5 { + margin-top: 1.25rem; } - .s\:flex { - display: flex; + .s\:mt-\[-63px\] { + margin-top: -63px; } .s\:hidden { @@ -2485,6 +2490,11 @@ video { padding-top: 0.25rem; padding-bottom: 0.25rem; } + + .md\:text-3xl { + font-size: 1.875rem; + line-height: 2.25rem; + } } @media (min-width: 960px) { diff --git a/osinaweb/static/js/pop-modals.js b/osinaweb/static/js/pop-modals.js index 456b5873..1103ed9f 100644 --- a/osinaweb/static/js/pop-modals.js +++ b/osinaweb/static/js/pop-modals.js @@ -75,6 +75,8 @@ document.addEventListener("DOMContentLoaded", function () { addButtonClickListener("deleteTaskButton", "400px", "140px"); addButtonClickListener("deleteNoteButton", "400px", "140px"); addButtonClickListener("deleteProjectNoteButton", "400px", "140px"); + addButtonClickListener("deletePointButton", "400px", "140px"); + diff --git a/osinaweb/templates/details_pages/business-details.html b/osinaweb/templates/details_pages/business-details.html index 32a80899..7f74779e 100644 --- a/osinaweb/templates/details_pages/business-details.html +++ b/osinaweb/templates/details_pages/business-details.html @@ -68,7 +68,7 @@ -