From 88f136be9b3afe55dc6a99fd4b0616d66aaaedb7 Mon Sep 17 00:00:00 2001 From: nataly Date: Mon, 18 Sep 2023 16:59:04 +0300 Subject: [PATCH] New changes. --- osinaweb/db.sqlite3 | Bin 319488 -> 319488 bytes osinaweb/input.css | 16 + .../__pycache__/forms.cpython-311.pyc | Bin 750 -> 1415 bytes .../__pycache__/models.cpython-311.pyc | Bin 11528 -> 12973 bytes .../__pycache__/views.cpython-311.pyc | Bin 15261 -> 20071 bytes ...rprofile_business_and_more.cpython-311.pyc | Bin 0 -> 2818 bytes ...ustomerprofile_customer_id.cpython-311.pyc | Bin 0 -> 919 bytes .../0023_task_assigned_to.cpython-311.pyc | Bin 0 -> 1035 bytes osinaweb/osinacore/views.py | 54 +++- .../osinaweb/__pycache__/urls.cpython-311.pyc | Bin 4530 -> 5145 bytes osinaweb/osinaweb/urls.py | 4 + osinaweb/static/dist/output.css | 54 ++++ osinaweb/static/js/pop-modals.js | 192 +++--------- osinaweb/templates/add-business.html | 2 - osinaweb/templates/add-customer.html | 8 +- osinaweb/templates/add-user.html | 94 ++++++ osinaweb/templates/addstatus-modal.html | 37 ++- osinaweb/templates/business-details.html | 34 ++- osinaweb/templates/businesses.html | 273 ++++++++++++++++++ osinaweb/templates/create-project.html | 2 - osinaweb/templates/create-task.html | 43 ++- osinaweb/templates/createtask-epic.html | 10 +- osinaweb/templates/createtask-project.html | 14 +- osinaweb/templates/customer-details.html | 8 +- osinaweb/templates/customers.html | 13 +- osinaweb/templates/index.html | 9 +- osinaweb/templates/main.html | 18 +- osinaweb/templates/project-details.html | 10 +- osinaweb/templates/projects.html | 6 +- osinaweb/templates/showpoints-modal.html | 18 +- osinaweb/templates/task-details.html | 6 +- osinaweb/templates/tasks.html | 10 +- osinaweb/templates/user-details.html | 250 ++++++++++++++++ osinaweb/templates/users.html | 266 +++++++++++++++++ 34 files changed, 1205 insertions(+), 246 deletions(-) create mode 100644 osinaweb/osinacore/migrations/__pycache__/0021_alter_customerprofile_business_and_more.cpython-311.pyc create mode 100644 osinaweb/osinacore/migrations/__pycache__/0022_customerprofile_customer_id.cpython-311.pyc create mode 100644 osinaweb/osinacore/migrations/__pycache__/0023_task_assigned_to.cpython-311.pyc create mode 100644 osinaweb/templates/add-user.html create mode 100644 osinaweb/templates/businesses.html create mode 100644 osinaweb/templates/user-details.html create mode 100644 osinaweb/templates/users.html diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3 index e1deaf01b1cbf418ee47a565c97194bb749a9910..ff81c4339b3a0b9ece3f6f0a2562eff3f6894b9c 100644 GIT binary patch delta 4241 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 E2eip$T>t<8 delta 358 zcmZoTAlz_3c!D(J#)&e{tQ#5h!o4=8%+_UO-lSK`$SAY9Oh3v&&{Vv%D_U; zz|g|N&|ve!d}RYQLEat)ehJA4Y8 z4Hc4jn|s!7?^(-O;lwP+`)NA+2S(-1h6X2ir{Dg=$l3n;FXQ&#f0;NhF-vnjna+NJ z*&L{68Q1nFx0n@JnWg!wrn7HgG~X=PV8g$?>OFH;0}q1$0|S3D2r}qxRxJ3-H=Vbh zWxtaF8xI2mgQ2J*r=X%DBZEg~W@dPPQFdltx`KaRN{W$zk+H6UxvsGxm}O|FYhcR8 z1=ImH?ma&c0xfyMFC)mo3>4&MV*-+_2o)drfe@(TDL;<@4@dWE>XU$0C?!l|y05(^8hK8b@rf{#(-l42xDDFRQ>$X6Q5HnyASy#8 zLs1s97fCUHh#*C(%z7jOc?db7Meo-#aQrp;M)w^kTZEGeWu&5MgzGDr53*(2j=rry zF7WoQia8Wxzz!?(?wCW-Ic7mlIps_zGLC||sL>2(ATMPvNiIS!;D=veb5T>K?^U_4 z3W4{*^?BHcmzBNXN!gABD{2CptgLpEHF#Vu+RAoa-0ixm;JQJ?5+C&u*L|OOe$OMY zfhs?}?1`Bs_nESj{+VhtLw*sql33ZT{y{%T7fU&LQ^NFQDU!{&76qkeQ7s907|T-G zi#>l89ijJ-t$1N0DuukA+I=(C+q~KfszrjAQYt1}t0D*JslX=7Cm_~N?*r$~dh+?> z*UGQyU1w^~nc8=z)@BE*=KiBsyUyI6Gq>-|tgO{=2y>$kU>lLE`h~H?%WEvpoC(Zz2a-PRtF|P{srjT*Umdg8H zrkXtPn!dOSh-x&5s!bp;OoA#G%961cCsO4FuXDk}8dqa2pd$)B--X5kDO}mr1UTSQ zmW!6SjBRjGj3His+PGK{Q5}Gl2@?XtWz}&Gq!`D@v~|}p+`vr5ZBQ@4EAN8%kCm~B zb+e<9D=)PU8OU`D?;Z$lC>M>PECenO9VKq!8Va0eIRj#FQb*HFJmh?Nl&&9N;O!-X zz-9Q_tllK{J^(ANT`B`~TY;Da&-5hFUqvd@EO0E&>tElP#Itl0;x! zKTVcfY$;iZdFlB@%s|0gEN(!JV3kF}AVpx6qCnO!4x8Nkl+v73yCMl7ml24I!-2#H ZW=2NF8w?T`P|;*QR@2GStlX?%696?HE|35K diff --git a/osinaweb/osinacore/__pycache__/models.cpython-311.pyc b/osinaweb/osinacore/__pycache__/models.cpython-311.pyc index e5a8228b81256fe67ff6eacd87871bd4bd15fd7b..58161853b1c8282969aad9b070d9625f613b9f94 100644 GIT binary patch delta 4510 zcma)9Z%kX)6@SnFu?;q0z=i;ZGEz5xy0!_40wg8;34~z47)WRm*YSH~rp9LX8P>40 zcGjq)TC&mIR_#_zil#M#HO=Tqs#aR3c2cxf(^h+WQqkKq^~*Np!&ai?Lz@rF&bikR zLW0(3zn||t=e&E)J@?$-eV!S4TQ2xze!f+J>&V~Ca%t5&1uyAzhXwjheG^R>Tz1KL zRv58JrUAicreEkDZjFd&oV&2Chx?`z;5Fg2FqTsY!hkR@`sYQ>5D$;b_^ZgVQ3W6H z(wKf^mu3!ylq3m-rV9h|s7&N|MBbhg*>FeX{CNwl zF7Sva=t6z-V#44Rt&j$nQ~+skP-^T*ZH5tjI?dYI-f}3|+1e6lCl7Ox>CoWe!N3vX z2fBO%!LHT;vYm@efp)MuL>}c`Ys+A;x2HGQHPlYNNza&Mn;R6w zgHTRym^`T}Y_8@>GxW&GFxd&hdbpKRfb{BTscK8cQo+CcncblO`ei^IU{0_=ND%;* zz(K*w7YJ8u+PQyHiN<9`Sy_HeB*7q2>7i-3s1t;@bo5+-$F{bA8TumVjXC{)^6u3;t>xSAKEC38q(CQtFH9u6Bpkw= z8=}EcWtR&#qzlQpN_wt-&tI&W6qBqpV0r z+)@FQzGp@l6(z@6%Sic*@T@pe0UN=oIa()`WMW(*QoGW=o`%-Ej$qkwrG8$gnOY*r=#)%)K#C&{Oezy{T#_Z?=MrmB zCgagK?0Jdw;-inDT+e+xfdX_ruP0sDhQU2tavfO##4Hx>lkRrz-hzn*zlKRgCYl8i zNo%!S*H$b2tIgxy3-&kBMUJ0TM@`03L(1rKiKp~36v(UMy=16dTC6T@6LqKc^qI2Z zDvSU6fA8G6quC<4{Dq>D=3ME}zn4{3`3lGgIMDRKkpzoO)5jCv(F~{LFd?0ElY5V0 z-b{+=i2FbTB|ixo<@W$zvT#*L^|D~fYoLF2*VNXjC0jo$Y4}S? z!_}!P(;sfj?&?!_^<_)?)sp^9KvGL&>hv@p@NS)(%6fOsw5j$@OBUaGnJrZdYvuwA$xLBWwy;SpY)T(oa(ZV?s?$5Se?iJP8?(+v)!CTtTC!Kp zbg1^q3&90L#=bLa->KSnrrVcXb+a9+t8PK}UR}nuFYDT;y7r}emK@bHQ;^`fCtwgq zW7g5AIvUfd&ZV;Y*{N4jb8YV#GG)!#vSzicIb(1w>kOr)w13$u6jaR&sri+2#S8I| z+cNq6+5CPrzdzlvs>4S!&SP2UG1Yktf^&G$o%e!!Vd%>7kLxl+ zBN@k2S;teV+}y;@W|H*jJh`QeUCQD?TOQ!VODcjMVti)@zzgT>gmEPOrS z{MflzUGS!u@`-$l;U*_|U55tVB=7LGV2; zFb_;lOe9E>yukXm9l$7KawO^P3CF`H!R{=`uS)$98KdJE53gL5P9jXvyu!*S zn$f@%jRW+G=NHcue=4ScZ&!Gcn`naO80UEoP4K(}N!Q`vb|S}+ zWXBRK*c`bk-3iX27pF@)m?AplM619p4^yH6t^JCZQM351ssA_!P6 ze061PjUt>x_!a_E3K;`X%m7|?r8$qFYT6DZXvG?2B>G+YzWY!6FpWO<|5=r3Fk&pk zN=dV<@H$D;Yo4yIXHk6$K(i|F)|Cw5yQ^k_M6nj17z^$>w0s_5EyuCxA&f0X%6Eu- zWnZReiaqq*iqBF%294k6*f2!Rn2aW4GWj{!X*Nk#A|yJIj3(lQh0R9C9iW+Wl|VK@ zkGzR+5nsw1XoUHc8b@dn9s<$;f%DK zkraE`^8+QgQQ<)-M_|0p>fDf&pG|7{_E%V;x!o?WtweoYZpjZb&mI-DTS055ub zZ?n(YHtimV1$o|(sWq1?7KjVGkZn7o&K3Xh3! zEAP_5M*=B>2!H7Bhgs7r_8Ta_byw;1pzZxIGj;Ct4V2%ytK3r|!rRgPFgyB6>;}qj lais}O_KS;Kw){eDEf5cj%ff?krr})E4W_%bfd$Ll{{S delta 3448 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 QFzn~+b8z@x3v6-z7ee|8RsaA1 delta 3829 zcmaJ@Yit`?6`pa%&cjY@$FDd^W9Maivdycs+f;4Yq?^!W(>83ku%Zj~x}ItA#*c7j zvLV~5DcVA_-B#N6_75xz1(sH&T2W+JB#`J2kod7kw53w3p}R?iszqqU56-zW zPE74EN?!Nx9zPLGDy;%+(oqn*ia&N77PogHMV25yj35Cu0Z2p@p%Z^J5g`hj z5RG~*b39*I)S;VAHEa_jY$6(FmmA&}18lZ&*8mwY8VaDOkUY8!b@(dVxe-H3!Ew!S z%rDU|^s^r|hMZ&)JRI2X8Wk~89BaBIioNXL&OLE%%k_euI(F>SP&k&!st_mhb;niR zs7KN(YFdW`OS!_L%ucw%`zTl#Ab5&^8)(+ZKytydFhY#Y2wFWt)O^g;oVjHZBdZ$h zD1PWVC=NbhktX?eB*+Wm_rB9%YAx$l0(!3^+ z!1u~(!yY0`5=;^B!0ouAz^%wVimIous!BO)m_~slOL~uRe?M=YAk}9PWE)JfueENO z{uI5K8(QJwIg+d8qBRX_N=G-^{F;+l6wY7rCDF&Du5fYLcSKyF++XvV!h_Zx@WRRU zFiOVFjZbB>Amgjyw08f{@`7r(pS5a@MBXJ8T?hL~`v3v?s2OBS+Q*|@i|`;yo?u@H zT;OF0Gb#A8gO_5Gy%O9sPPI2{E%DB-C`66^aGF^qRobgVsJhC29USM$&rEo%l&L`L zjdI;)+U3@4s8ZgsvMmya7m>l(rBK|o#p>FEn|Yh@CaP3(SL^~0<8!F`Hk)d*R26SZ zQ3lJMxE=>oS#qIZvMdNMp_%XE|6{9TC97ivSL<8x+Z{tU>+d+n?m5S9OJhKrJ+n7Z z)*Uo^uk!1ta^@}zTe5HjeO)Ji?BmW}GwUfH`q4!#lUKF>Yt4zFm*pUZR&L@ye4c>E z#)_Sxr#GlyS+5*O8nu2(nn_cAB0A0PM*{v@U-_k|-+m0me#OF3s`o@RIb2H)MGOy> z7tbqwQA_3uN-7H(B!9quYiZ7~@oxY2jkH@xn?3+bcOG@`;6EHEAkQ=GUU$dVjr0S2 zb3s+qyq-yA%OT`Y`#y%y&UW`S^8{wt<(|NXNw~?(LLrmatvCv3;Ew`(&=a$?$GauA zuh&zvTx_A&?*`QP3k6*f`NQ7O=thxy6*a5sDnExUr#hLbV;<>I=D- zP`X487YWQ#4fO{$F14P?safnf%iA)l{fkr=*7bkc-(K6{qyDht1j_wKV4hg4BZA8` zP1y3|zy%#)k9*kjv37Bhjc%D|_hWB{PYR0tDt_2E=;P)OPJPD#@UpMR2VUgUPEzo= z1r?ccBZTk=yaZbaNC27h~nT9y9l z_C3HqPk_+vW4}*y`x~sYV)%}8=gAz+A9E7%NxNMTLIUtX@H%ncAa8Y=s>3jQZz$s6*M_s~?vU&t7Mx?^ zaL8E^9qS$5;o#%>Ep~KxR~Ij^ix=1$fA9_}MybYe8~boPUi|a$H>5dU6}z6%@iIi_ z45y-MX~-<-nL?hYbzL-U8D+f)vID+NA#ms1;}v=}i^P7jwN0T5lk9vVe=|9rHYO{; zUILzL3$6ALNCYa0vS!B@EfYA65=h$qFrN3?fI$5lH`-t=pE8qy&eu(h&nHnUxKOocG& zDV-!%y_R!c1)ht<=k`_9(C9Oyo0#>ql_$LUjd8j6P(&}z?fjEicR(Itcc**At?Z-e z3oAh57P<*M1Um?J6FfsempGUupnD9za`3wX(A4KMn-5Yx10hW`8c%%Ez&x#T1axQv zox?yUDJ&7tDF-LU2@%O5xF!uhqBRX+*u<12QtpzUXw=iarI zT&#Om58B12O9H~9I>F{S(^aw&!NYFMUJFX%j*@_|#v+1?eQRHje*;Fl*v9(zzug%{ dTP2%U94!e5Yx+cpv4{H)wg>}atVF;g{V)G5bx{BS diff --git a/osinaweb/osinacore/migrations/__pycache__/0021_alter_customerprofile_business_and_more.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0021_alter_customerprofile_business_and_more.cpython-311.pyc new file mode 100644 index 0000000000000000000000000000000000000000..96fe2b56d8facfc1870e58ff77d33ffcf98ff416 GIT binary patch literal 2818 zcmb_eO>7fK6rNqL*SkwXl1(U3pn?RY@u4w=N=>UessU5f2B^r78cSuh-kF$n_Q%Yw zNkbzwhaTD+hf3TlHBE&N9CPS_Lk~SV(jKf)Z$0H^1SbwvXJ)-lAT%@)WAAw8&3oUx z|MjoEy&9ln{;v$Ws{-&h+ax31Sv>ucE*<~~px^*kCVQ71mAS)8hwJX>RZQl!s?D`Nn z!F8)6$A9$B=IIK>djJq92@sS-5zzajgb}5ya*2NWt|DZ{yyE=`0fN>Qua z6O0NaD4|2uo`j=HJrj>=Z+CS#S;2HeUZZzE?B3tVylC;R`xJg(Ul&1wDwG=9i&C#e zImA)=ccAn%de=m%34P-6T8zVQ0Hf~>VD#_87}&QhI>#7DY-dqy4DQn(LmcCvnQ&y^ znef)jc2@vA`m+F!HIDBy8{XzfNqx{9{{I=gvtAk}_P)2Gl?LHSTEC}=dMzndTDhtp z*q&+m7!mc{x%20Y&2>`wRoC$9ZW&>s)XX4Q@-f_6WsLnb zgah9*9b*ZV13N?s4C@X=#b^OxV;6J`zOdUl8?2DjKS zh-MhngLP_|L3#}1PTh2v7Yzfm=0%2rC9_sD%k&%~u83zXW7fGzUtxCUsxdoVylGs! zak)4}db%7o3W!#4LWHldSYYk$*rjd-9SPJL1Uqd;X%5fgKb=R95(f-O?@iTr}maQ)zXKV3d8F|8^cXKzp3XVJ-@fi$pgro zK7b5$Pgl2*rarl;Pe%IW-nxyn^fUKIf6A>(k3MMX6Px-(q)+TELe2S)D9{i%LP2Da zxX2@MQDl+0DDDk-d|PiSI&qZ&?3`!CuQ=vB$DHSw^RK}?+R{f^oJQAYHs*exkMh@| z{9Kg3)wC8P>)WQjvZ=2``pV0SeJxzj<<-yG2TvqIOSUX3+xK4eE$J_moObU@0$ zz}T(-fDh3hz`(#yC{l*VVq@y&DxEsbb z>qa#3LJ?idwg3L%J~0f(5h zl?{*ktOXPeQp5?#ECSmj?l874&xkY$&AXd4 zDsX0neLlT`&uA>AJAUgtjd>J1AVA`Vfpaf((}0U4c3L!{{pRzncKuWBYyJDJeY^R?ZVv5cUe!$N5P><8CRcS^A3Tsdx>Sy8HMGo} ze8Dp76q*%EO~_o7Wku}*c*n-tMEKj$6@c)Up!gY>T*VjzLEP9!i?dIz&tW}Bvu4K{ Pp1XD^6G#8a7IS|CG3EM= literal 0 HcmV?d00001 diff --git a/osinaweb/osinacore/migrations/__pycache__/0023_task_assigned_to.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0023_task_assigned_to.cpython-311.pyc new file mode 100644 index 0000000000000000000000000000000000000000..bec5f55cfce844570352b8be138a0d21f4630c12 GIT binary patch literal 1035 zcmZuw%}>-o6rX9k-L^oY8v-E$!C;Jga7*yC#+VQg;}-|fgS||;JF}bCeylUy0G>D) z{~X!mZHjQaAD9h;coPF$vgKd*qvc%n>+wFO)+-fCDjb6b!r2Q58V6^OLZGrA7Cv zWdM&{qO{@4k$y4Pqv}O0PMpMs$lm1UvodW_gBdd~a@#Q_d}(E6 zbrrSyEQv!xdo=EN0U2ZDVXh@Ed(9_Y#=LGsFiPSVZ)e5<8Z2=;ozcF!%C)E;1mb`Q z31&z_xRS)eY~@U$$PI~bk+Rb9NPxHMQ`|tg9U*QZB>eg!0mLT}dee6U=_?T?JrZFO zwLQY9Yz{ZpFy53gs3xJcDasKUJ|TNt$G#hNW3J#9H}X70yLfedZF_xf;{mtg9vQXp z3pkNBWHBb3>quB07@_D0<9ha^gvz2zouuqPKH_jVE2j>t}qM=;lSNULy?wA$yF z#1;hKL6SrC4~3219+l0_h3r0)cW8e+GaZwindow.top.location.reload();') - return render(request, 'addnote-modal.html') + + + @login_required def save_project(request): if request.method == 'POST': diff --git a/osinaweb/osinaweb/__pycache__/urls.cpython-311.pyc b/osinaweb/osinaweb/__pycache__/urls.cpython-311.pyc index 9ac6e98538f14cf8dd05288c2325bd20bc747e25..50a3d3a428826eb31b7f6bad73a81cd5841dd4bf 100644 GIT binary patch delta 1183 zcmZ`%OHUI~6z;(3i_(^=NL!wQJo=c90TG1)McQI{6;Qw!kszG~M8$N##Kr*bTox~j zx?`nHbWvra8-K%{93-4r3zt=tI&P+eFz3OtkaXPC^e9e8g z%0H_2TwdYl`%aIU#4610xNKPupouG!cq!DmlUxcK0++^6y1}K;iIhTVoJ-*oX#%B5 zE{P}76qf?iT#B4X>38~hu3kgfe>}@yNU(-JIy6lotwNeXTGKya)OeESLOb*Ke2h>?sgPoj z(gtz&km1(nWp+MP3Q`zUVUWR~HjHjeATE#BHX+26 zVUO23rQ>Nb;qh71I-b$>Ssl+Ip1Y~zTf*s=6)7!KNT`rtkkID!z{39nix}8-;FTTY G|KC5L$60~^ delta 703 zcmZ{iv2PM_6vu%+XrTgkp%pklq`*~>Qf+N(5ekMwrI(a6ri+Orrrc0d(+YHOg2~j4 z=GOre<6unch_cwh(fxPHFD@?q6Mnlf@!nlG)4SZu=icYN@BM~*f9qS)cjonaY{vDr z0a|zZ#22#9e4Q7aQ_nIj<*6-G8>d{=2|?IB>U0lYY3-KQeX+OSA@AJVLc)5{T8Hg} zm)dT3T=t|K6I+=q`F!ns{Ms9|3kf5+J%=TUB}G2@-gv48+Ks1^BWZs#Ec+c7Fx6L% zLxYvm!f9EDB!eV(%H)GTYM05mS%3Luga7*HjhYr@r?JHaauNtSM49Xfu>>||Y)*Gy zq3+0VhsBoY`X&Wc2bF=!XJv9G#Ej*iLOhML(&cRKi^lQ_Ri9I6>d<7+8@^N@6!f{)ke~jLn&`$I-zN3oeXQ3KbnH3@Us92lJMd z20LsvGjdZX=ulu#;EQPQTxIW~UAjE5G_0}c8r|5U(9og5puv~X_wHHi@nM=t%ir@9 z>N?aJ)cFePRm(;O8oPdbl%-J8p~RrX*U;X#Y;5Rcp~cZYg{lr!235X}wqV)+kNp5` z(Xy*%bao_BDC$sTP~;`l8&^e_(JEv+5Spynksp!6KzQ=8$xqCF-Q-PVK}GIQ/', views.customerdetails, name='customerdetails'), path('addbusiness/', views.addbusiness, name='addbusiness'), path('businessdetails/', views.businessdetails, name='businessdetails'), + path('businesses/', views.businesses, name='businesses'), + path('adduser/', views.adduser, name='adduser'), + path('userdetails/', views.userdetails, name='userdetails'), + path('users/', views.users, name='users'), path('projectdetails//', views.detailed_project, name='detailed-project'), path('createproject/', views.create_project, name='createproject'), path('createepic//', views.create_epic, name='createepic'), diff --git a/osinaweb/static/dist/output.css b/osinaweb/static/dist/output.css index 7e074e91..db16ba17 100644 --- a/osinaweb/static/dist/output.css +++ b/osinaweb/static/dist/output.css @@ -743,10 +743,18 @@ video { margin-top: 1.5rem; } +.mt-\[-63px\] { + margin-top: -63px; +} + .mt-\[5\%\] { margin-top: 5%; } +.mt-\[50px\] { + margin-top: 50px; +} + .block { display: block; } @@ -848,6 +856,10 @@ video { width: 100px; } +.w-\[120px\] { + width: 120px; +} + .w-\[14\%\] { width: 14%; } @@ -932,6 +944,10 @@ video { width: 380px; } +.w-\[40\%\] { + width: 40%; +} + .w-\[40px\] { width: 40px; } @@ -964,6 +980,10 @@ video { width: 55%; } +.w-\[55px\] { + width: 55px; +} + .w-\[60px\] { width: 60px; } @@ -1121,6 +1141,10 @@ video { overflow-x: auto; } +.overflow-y-auto { + overflow-y: auto; +} + .rounded-full { border-radius: 9999px; } @@ -1243,6 +1267,11 @@ video { border-color: rgb(255 255 255 / var(--tw-border-opacity)); } +.border-yellow-500 { + --tw-border-opacity: 1; + border-color: rgb(234 179 8 / var(--tw-border-opacity)); +} + .bg-black { --tw-bg-opacity: 1; background-color: rgb(0 0 0 / var(--tw-bg-opacity)); @@ -1698,6 +1727,21 @@ video { transition-duration: 300ms; } +.fixedSideHeader::-webkit-scrollbar { + width: 5px; + /* Width of the entire scrollbar */ +} + +.fixedSideHeader::-webkit-scrollbar-thumb { + background: #7B8894; + /* Color of the scroll thumb */ +} + +.fixedSideHeader::-webkit-scrollbar-track { + background: #5a5a5a3c; + /* Color of the scrollbar track */ +} + /* FOR THE IFRAME TO TAKE 95% OF WIDTH ON SMALL SCREEN SIZES */ @media screen and (max-width: 798px) { @@ -1736,11 +1780,21 @@ video { background-color: rgb(255 255 255 / var(--tw-bg-opacity)); } +.hover\:bg-yellow-500:hover { + --tw-bg-opacity: 1; + background-color: rgb(234 179 8 / var(--tw-bg-opacity)); +} + .hover\:text-blue-500:hover { --tw-text-opacity: 1; color: rgb(59 130 246 / var(--tw-text-opacity)); } +.hover\:text-gray-500:hover { + --tw-text-opacity: 1; + color: rgb(107 114 128 / var(--tw-text-opacity)); +} + .hover\:text-red-500:hover { --tw-text-opacity: 1; color: rgb(239 68 68 / var(--tw-text-opacity)); diff --git a/osinaweb/static/js/pop-modals.js b/osinaweb/static/js/pop-modals.js index 2efbf722..266177e5 100644 --- a/osinaweb/static/js/pop-modals.js +++ b/osinaweb/static/js/pop-modals.js @@ -1,192 +1,68 @@ document.addEventListener("DOMContentLoaded", function () { - // Function to open the modal - function openModal(url) { - const modalContainer = document.getElementById("popUpModal"); + function openModalWithDimensions(url, width, height) { + const modalUrl = url; + openModal(modalUrl); - //Get the iframe element const iframe = document.getElementById("popupModalFrame"); + iframe.style.height = height; + iframe.style.width = width; + } - //Get the body element + function openModal(url) { + const modalContainer = document.getElementById("popUpModal"); + const iframe = document.getElementById("popupModalFrame"); const body = document.body; - //Disable scrolling body.style.overflow = "hidden"; - - //Set the URL of the iframe to load the external content iframe.src = url; - - //Display the modal modalContainer.style.display = "flex"; } - //Function to close the modal function closeModal() { const modalContainer = document.getElementById("popUpModal"); - const iframe = document.getElementById("popupModalFrame"); - - //Clear the URL to stop loading the content - iframe.src = ""; - const body = document.body; - //Enable scrolling + iframe.src = ""; body.style.overflow = "auto"; - - //Hide the modal modalContainer.style.display = "none"; } + function addButtonClickListener(buttonId, width, height) { + const button = document.getElementById(buttonId); + if (button) { + button.addEventListener("click", () => { + const modalUrl = button.getAttribute("data-modal-url"); + openModalWithDimensions(modalUrl, width, height); + }); + } + } - const closeButton = document.getElementById("closeModalButton"); + // Add button click listeners with dimensions + addButtonClickListener("addStatusButton", "450px", "200px"); + addButtonClickListener("addNoteButton", "400px", "225px"); + addButtonClickListener("addFileButton", "500px", "320px"); + addButtonClickListener("addCredentialsButton", "500px", "300px"); + addButtonClickListener("updateStatusButton", "fit-content", "160px"); + addButtonClickListener("showPointsButton", "600px", "450px"); + addButtonClickListener("addPointButton", "500px", "225px"); + addButtonClickListener("timelineButton", "600px", "450px"); + addButtonClickListener("addTimeButton", "300px", "270px"); + addButtonClickListener("deleteTaskButton", "fit-content", "130px"); + const closeButton = document.getElementById("closeModalButton"); closeButton.addEventListener("click", () => { closeModal(); }); const modalContainer = document.getElementById("popUpModal"); - // Event listener to trigger the modal when clicking outside of it window.addEventListener("click", function (event) { if (event.target === modalContainer) { closeModal(); } }); - //ADD STATUS MODAL - const addStatusButton = document.getElementById("addStatusButton"); - - addStatusButton.addEventListener("click", () => { - const modalUrl = addStatusButton.getAttribute("data-modal-url"); - - openModal(modalUrl); - - const iframe = document.getElementById("popupModalFrame"); - iframe.style.height = "200px" - iframe.style.width = "450px" - }); - - //ADD NOTE MODAL - const addNoteButton = document.getElementById("addNoteButton"); - - addNoteButton.addEventListener("click", () => { - // Retrieve the URL from the data attribute - const modalUrl = addNoteButton.getAttribute("data-modal-url"); - - // Open the modal with the retrieved URL - openModal(modalUrl); - - const iframe = document.getElementById("popupModalFrame"); - iframe.style.height = "225px" - iframe.style.width = "400px" - }); - - //ADD FILE MODAL (in the inner project page) - const addFileButton = document.getElementById("addFileButton"); - - addFileButton.addEventListener("click", () => { - const modalUrl = addFileButton.getAttribute("data-modal-url"); - - openModal(modalUrl); - - const iframe = document.getElementById("popupModalFrame"); - iframe.style.height = "320px" - iframe.style.width = "500px" - }); - - - //ADD CREDENTIALS MODAL (in the inner project page) - const addCredentialsButton = document.getElementById("addCredentialsButton"); - - addCredentialsButton.addEventListener("click", () => { - const modalUrl = addCredentialsButton.getAttribute("data-modal-url"); - - openModal(modalUrl); - - const iframe = document.getElementById("popupModalFrame"); - iframe.style.height = "300px" - iframe.style.width = "500px" - }); - - - //SHOW TASK MODALS - //Show the update status modal - const updateStatusButton = document.getElementById("updateStatusButton"); - - updateStatusButton.addEventListener("click", () => { - const modalUrl = updateStatusButton.getAttribute("data-modal-url"); - - openModal(modalUrl); - - const iframe = document.getElementById("popupModalFrame"); - iframe.style.height = "160px" - iframe.style.width = "fit-content" - }); - - - //Show the show points modal - const showPointsButton = document.getElementById("showPointsButton"); - - showPointsButton.addEventListener("click", () => { - const modalUrl = showPointsButton.getAttribute("data-modal-url"); - - openModal(modalUrl); - - const iframe = document.getElementById("popupModalFrame"); - iframe.style.height = "450px" - iframe.style.width = "600px" - }); - - //Show the add point modal - const addPointButton = document.getElementById("addPointButton"); - - addPointButton.addEventListener("click", () => { - const modalUrl = addPointButton.getAttribute("data-modal-url"); - - openModal(modalUrl); - - const iframe = document.getElementById("popupModalFrame"); - iframe.style.height = "225px" - iframe.style.width = "500px" - }); - - //Show the Timeline modal - const timelineButton = document.getElementById("timelineButton"); - - timelineButton.addEventListener("click", () => { - const modalUrl = timelineButton.getAttribute("data-modal-url"); - - openModal(modalUrl); - - const iframe = document.getElementById("popupModalFrame"); - iframe.style.height = "450px" - iframe.style.width = "600px" - }); - - //Show the add timeline modal - const addTimeButton = document.getElementById("addTimeButton"); - - addTimeButton.addEventListener("click", () => { - const modalUrl = addTimeButton.getAttribute("data-modal-url"); - - openModal(modalUrl); - - const iframe = document.getElementById("popupModalFrame"); - iframe.style.height = "270px" - iframe.style.width = "300px" - }); - - //Show the delete task modal - const deleteTaskButton = document.getElementById("deleteTaskButton"); - - deleteTaskButton.addEventListener("click", () => { - const modalUrl = deleteTaskButton.getAttribute("data-modal-url"); - - openModal(modalUrl); - - const iframe = document.getElementById("popupModalFrame"); - iframe.style.height = "130px" - iframe.style.width = "fit-content" - }); - -}); \ No newline at end of file + // TO RELOAD THE TOP WINDOW AFTER ADDING + // window.top.location.reload(); +}); diff --git a/osinaweb/templates/add-business.html b/osinaweb/templates/add-business.html index b4b3a18c..639bc57a 100644 --- a/osinaweb/templates/add-business.html +++ b/osinaweb/templates/add-business.html @@ -2,8 +2,6 @@ {%load static%} {% block content %} - -

diff --git a/osinaweb/templates/add-customer.html b/osinaweb/templates/add-customer.html index 1d959630..f26a809a 100644 --- a/osinaweb/templates/add-customer.html +++ b/osinaweb/templates/add-customer.html @@ -2,7 +2,6 @@ {%load static%} {% block content %} -
@@ -58,6 +57,13 @@ Select Business

+
+ + + +
+ + + + + +
+
+ + Upload + Profile Picture + + +
+
+ + + + + + + + + + + + +
+ +
+
+ +
+
+ + + + + + + +{% endblock content %} \ No newline at end of file diff --git a/osinaweb/templates/addstatus-modal.html b/osinaweb/templates/addstatus-modal.html index 4a0e907c..93eaf429 100644 --- a/osinaweb/templates/addstatus-modal.html +++ b/osinaweb/templates/addstatus-modal.html @@ -2,6 +2,7 @@ + @@ -15,21 +16,49 @@

Add Status

- +
- +
- +

Add Status To Task

- + + + +
+ \ No newline at end of file diff --git a/osinaweb/templates/business-details.html b/osinaweb/templates/business-details.html index 22901635..a6c79409 100644 --- a/osinaweb/templates/business-details.html +++ b/osinaweb/templates/business-details.html @@ -53,13 +53,13 @@ - -
- + +
+
-
-
- +
+
+

Emile Ellye - Ositcom

@@ -75,8 +75,8 @@
-

Name: Ositcom

+

Name: Ositcom +

@@ -85,8 +85,8 @@
-

VAT: Checked

+

VAT: Checked +

@@ -108,12 +108,22 @@

Business Type: Association

+ +
+

Related Customer: + + Emile Elliye + +

+
+
+ -
+

USERS ACTIVITY

-
+
diff --git a/osinaweb/templates/businesses.html b/osinaweb/templates/businesses.html new file mode 100644 index 00000000..529f5e46 --- /dev/null +++ b/osinaweb/templates/businesses.html @@ -0,0 +1,273 @@ +{% extends "main.html" %} +{%load static%} +{% block title %}My Projects{% endblock %} +{% block content %} + +
+
+
+
+

Recent Note:

+

Send an Email to Salim.

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

Businesses

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

Name

+
+
+

Business Type

+
+
+

Financial number

+
+
+

Actions

+
+
+ + +
+ +
+
+

HII

+
+
+

Non-profit

+
+
+

2022

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

USERS ACTIVITY

+
+ + + +
+
+
+
+
+ user profile +
+
+

Nataly

+

11:30 AM

+
+
+
+ +
+
+ + +
+

Closed - Create the Osina home page

+
+ + +
+ + +
+
+
+ + +
+
+
+
+
+ user profile +
+
+

Salim

+

11:30 AM

+
+
+
+ +
+
+ + +
+

Closed - Create the Osina home page

+
+ + +
+ + +
+
+
+ + +
+
+
+
+
+ user profile +
+
+

Emile

+

11:30 AM

+
+
+
+ +
+
+ + +
+

Closed - Create the Osina home page

+
+ + +
+ + +
+
+
+ + +
+
+
+ +
+ + + + + +
+ + + + + + +{% endblock content %} \ No newline at end of file diff --git a/osinaweb/templates/create-project.html b/osinaweb/templates/create-project.html index 0f361959..c6aa816d 100644 --- a/osinaweb/templates/create-project.html +++ b/osinaweb/templates/create-project.html @@ -2,8 +2,6 @@ {%load static%} {% block content %} - -

diff --git a/osinaweb/templates/create-task.html b/osinaweb/templates/create-task.html index cad9074e..5edeb807 100644 --- a/osinaweb/templates/create-task.html +++ b/osinaweb/templates/create-task.html @@ -9,47 +9,58 @@

Create Task

- +
- - - - - - - - - + + + +
- +
- +
- + - +
-
- +
+
{% if customer.status == 'Active' %}
@@ -197,9 +197,9 @@
-
+

USERS ACTIVITY

-
+
diff --git a/osinaweb/templates/customers.html b/osinaweb/templates/customers.html index 12cab0f5..e618d322 100644 --- a/osinaweb/templates/customers.html +++ b/osinaweb/templates/customers.html @@ -53,14 +53,14 @@
- -
- + +
+

Customers

- +
@@ -163,10 +163,9 @@
-
+

USERS ACTIVITY

-
- +
diff --git a/osinaweb/templates/index.html b/osinaweb/templates/index.html index db87be09..6303130b 100644 --- a/osinaweb/templates/index.html +++ b/osinaweb/templates/index.html @@ -7,7 +7,7 @@

Recent Note:

-

Send an Email to Salim.

+

--

+ class="w-[120px] px-2 py-1 bg-transparent border border-yellow-500 rounded-md text-yellow-500 hover:bg-yellow-500 hover:text-white">Working + On
@@ -34,9 +37,12 @@

Fix the LaylNhar Header

-
+
+ class="w-[120px] px-2 py-1 bg-transparent border border-blue-500 rounded-md text-blue-500 hover:bg-blue-500 hover:text-white">Complete +
@@ -48,8 +54,8 @@ cumque ex amet! Sequi aliquid quos ullam, sapiente iste impedit explicabo?

- +
diff --git a/osinaweb/templates/task-details.html b/osinaweb/templates/task-details.html index 489ebfde..060da761 100644 --- a/osinaweb/templates/task-details.html +++ b/osinaweb/templates/task-details.html @@ -272,7 +272,7 @@
-
+
@@ -502,9 +502,9 @@
-
+

USERS ACTIVITY

-
+
diff --git a/osinaweb/templates/tasks.html b/osinaweb/templates/tasks.html index 427dfb99..4d009c5f 100644 --- a/osinaweb/templates/tasks.html +++ b/osinaweb/templates/tasks.html @@ -52,9 +52,9 @@
- -
- + +
+

My Tasks

@@ -287,9 +287,9 @@
-
+

USERS ACTIVITY

-
+
diff --git a/osinaweb/templates/user-details.html b/osinaweb/templates/user-details.html new file mode 100644 index 00000000..014f75bd --- /dev/null +++ b/osinaweb/templates/user-details.html @@ -0,0 +1,250 @@ +{% extends "main.html" %} +{%load static%} +{% block title %}My Projects{% endblock %} +{% block content %} + +
+
+
+
+

Recent Note:

+

Send an Email to Salim.

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

Nataly

+
+
+
+ + +
+
+
+
+

Username: Nataly

+
+ +
+

Password: -- +

+
+ +
+

Group: Group + 1

+
+ +
+

First Name: Nataly

+
+ +
+

Last Name: Nataly

+
+ +
+

Email: nataly.aw@ositcom.net

+
+ +
+
+ + +
+

USERS ACTIVITY

+
+ + +
+
+
+
+
+ user profile +
+
+

Nataly

+

11:30 AM

+
+
+
+ +
+
+ + +
+

Closed - Create the Osina home page

+
+ + +
+ + +
+
+
+ + +
+
+
+
+
+ user profile +
+
+

Salim

+

11:30 AM

+
+
+
+ +
+
+ + +
+

Closed - Create the Osina home page

+
+ + +
+ + +
+
+
+ + +
+
+
+
+
+ user profile +
+
+

Emile

+

11:30 AM

+
+
+
+ +
+
+ + +
+

Closed - Create the Osina home page

+
+ + +
+ + +
+
+
+ +
+
+
+
+ + + + +
+ + + + + + + + + +{% endblock content %} \ No newline at end of file diff --git a/osinaweb/templates/users.html b/osinaweb/templates/users.html new file mode 100644 index 00000000..09ff19ce --- /dev/null +++ b/osinaweb/templates/users.html @@ -0,0 +1,266 @@ +{% extends "main.html" %} +{%load static%} +{% block title %}My Projects{% endblock %} +{% block content %} + +
+
+
+
+

Recent Note:

+

Send an Email to Salim.

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

Users

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

Username

+
+
+

Group

+
+
+ Actions +
+
+ + +
+ +
+
+

Nataly.aw

+
+
+

Group 1

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

USERS ACTIVITY

+
+ + + +
+
+
+
+
+ user profile +
+
+

Nataly

+

11:30 AM

+
+
+
+ +
+
+ + +
+

Closed - Create the Osina home page

+
+ + +
+ + +
+
+
+ + +
+
+
+
+
+ user profile +
+
+

Salim

+

11:30 AM

+
+
+
+ +
+
+ + +
+

Closed - Create the Osina home page

+
+ + +
+ + +
+
+
+ + +
+
+
+
+
+ user profile +
+
+

Emile

+

11:30 AM

+
+
+
+ +
+
+ + +
+

Closed - Create the Osina home page

+
+ + +
+ + +
+
+
+ + +
+
+
+ +
+ + + + + +
+ + + + + + +{% endblock content %} \ No newline at end of file