From ec7abee6b9f312b1e0e45a5c4df55f19454dc506 Mon Sep 17 00:00:00 2001
From: Salim Elliye <salimelliye@Salims-MacBook-Pro-2.local>
Date: Thu, 28 Aug 2025 00:15:15 +0300
Subject: [PATCH] new

---
 osinaweb/db.sqlite3                           | Bin 2383872 -> 2383872 bytes
 .../__pycache__/admin.cpython-313.pyc         | Bin 4279 -> 3669 bytes
 .../__pycache__/serializers.cpython-313.pyc   | Bin 9418 -> 10368 bytes
 .../api/__pycache__/urls.cpython-313.pyc      | Bin 1047 -> 1150 bytes
 .../api/__pycache__/views.cpython-313.pyc     | Bin 6619 -> 7203 bytes
 osinaweb/osinacore/api/serializers.py         |  21 +++++++++++++++++-
 osinaweb/osinacore/api/urls.py                |   1 +
 osinaweb/osinacore/api/views.py               |   9 ++++++++
 8 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3
index 06ca3edbbcf9f903c1d953804b52413d9f87980f..713078a050cdfa5c41cdef43e034caffae3f8cd9 100644
GIT binary patch
delta 208
zcmWN=%MF4+6a`R5R0b8n{|8i1wiuWM6*g)tfEHdUxES3^6;@!_+JakpA@QE%<llnj
z__A45I5$?^NfMLPkfcg#N@_`JOVU2X-)E+l{K9{x?>!7n(UmLLMJVDRJO$$DiYSeu
zR3!WO5G7&!tTT=}cCd>*G_a2*S~$QVj&O_<oZ<}UxWFaa=->+1xIq^^+~TgRGhem-
Dg&|NT

delta 208
zcmWN=$qj-~6a`S8sNjI$Jb;SI76Zs&*r>4pT6m@4;_FtbumZ!@7F<z{iT5NY{}hzt
z)1<1fu2kJvFbS>+mIc=ZHv~5YD{od`Cz49_tbTRJxoe6<(uIfuFNj<(c0J$rk7?wk
zQL;aTVVpdEnTjoJV+XsaVGngQu#W>A;t0n$!70vgjtex=!X>V7jW%v@i@WldIkNEw
DS9wp^

diff --git a/osinaweb/osinacore/__pycache__/admin.cpython-313.pyc b/osinaweb/osinacore/__pycache__/admin.cpython-313.pyc
index a03ad41648fc632bf824e15336b77107b858f066..8f7af81a581e095ec27347f750029758e6db1cb3 100644
GIT binary patch
delta 207
zcmdn4cvXh)GcPX}0}y0nug^HZx{;5MlTmZBEawL<Mvy2Fe3qE3#~~?_&Z5bBi!&s#
zINLELH#6_07*J~RJT5VgB2FO7Pm^tOH;<HwAdn3fC=vp(gh7M`i~wmVW(N{&3^#<d
zn!O=vG$zaN`Y~!u&gM-Jxy2q(l%JKFTyl%kH!~--xFkO>b@El-ql{jYXY=`sGBRpU
eV7)G&a8W?v3j>hzfrEjOZSq8Z+08Qivl#&v+%d=i

delta 649
zcmcaAvt5zzGcPX}0}$-skH|1$-^j<u$+&W|EawL<CXgr)e0G_v$Dvps!<NGi5nx~l
zW|Lwl;s|Ds;Xo4ODB?`#)a1Iw8Io9>?U<6AnfFo*s6mtY7E4}YZt5+8^wg60f};Ga
z)Z~(Qu!s;yBsViBwYVfdFBL4N$#jbys^%6aTq>D~Ve$-)?D~~VezzEPHJOU^fCd+7
zg9s%cQ4Dgbf<lonNI(Zj+>(O3K@Z(lDUb$PAkn~ZLs@OP^>XWu;{NK+>g)XS7y0Ec
zaF}m!1`<U=AY<4AAkGEa4+4|taHQ8483I{AC+Gty98S;$O5Kt{bpqTkU~kF+Rlppf
zs<AwFc`VQowVk!s`4unnD_-ER-oXqcAdcYlg@sTNCj&!0gP$f>5h%urxIqLDh~Nbg
zY9K-#M1X@pus9>Xs3blmwK%ybv!En1Kd%Vnt|CDY0W^pKY&s;&G(lVt0gA9<4It6R
za6{O&!RLmMR)hB^7DiT!2bx9~SVXR{h^c|NHV?GTF0hDQXVHL|qB(g3mmj0%<o{d=
zTty}z)69Xy<YMlljG>b)dHhAW7|kcJUKdcfD4_6#0m%6v#lXlmS)W&S^Dds*i~xz`
BsMP=f

diff --git a/osinaweb/osinacore/api/__pycache__/serializers.cpython-313.pyc b/osinaweb/osinacore/api/__pycache__/serializers.cpython-313.pyc
index 1b1b7c66939a16e54042bfcbb77b2f14335fe356..6aaaa0fe566e62e4b24944234084340bdc5522bb 100644
GIT binary patch
delta 754
zcmX@**$~M0nU|M~0SLlM*JtF2P2`hcwAiT5&&(ykpu`ZYBE=A_I&pzKt8luSrut?p
z<{#3GD<>PvZ)RM(`MLZ(rpcc;#Ta8ISIfyW1@TQjBPZ*`0oKO?)W>Sd1TvR_p@=h>
zO^Tt2E112AJDo$5^OmSfVrEWdP-;PbQAu!WQD$OJW>sp@%Y8t#Aw{buZ)CQSmBOk-
z&o{Ls@#W#kh5TyVND3w^imGt!1?oNwvdwVv2YD$kRv?oZh(9+0iKz^74ADRu0)jx|
zXdsj^hy_gu$mL@QW(=LUP_&+p!I(Li3FaXc21SNw4w!OwhD4x&3JmfL=?rNMw#@Pj
zX^fi8ezzDEssvRdbyah9RZ|pHJ*`xI6;ul}S#NQqB$lL>Wag&c;wUaDDgd)sKw`I8
zz-&&}isV$FaDJX9Q_)<YEk*O{fn+f#G!+zz#DLT-j`Y-$c(5Khq;Nolr5;TF1W2a?
zkZ54|z{J8S@kChqy0FScVU-ok>p50(EU4NbxWRb4#YT$_S{GDpFW3iN77o6^6a3>2
zzr<$-Mox*F!r~v88D%&neiicoO=;3IWZ1}M$Gn%(j=2aV;HSwmxshK)sYnLMxy4#s
zl9-lO1Pb4xr6A%6h!6)6$0sw&NqFo6F+l_<u8TE+L>t3R9;Fo_7kP{tTyJoTUFX)h
z#I19gTd%?8I~x<L^hX9D@s*2}Ria1~rq@qXWbz567RFtZJ(Oj+&H{xQL8hf{&Q}g#
fl>NdWz!<^!MT4JFVuts18S{%W=3g0r9I$=>#Jj+r

delta 91
zcmZn&JmtyvnU|M~0SNq**JrefOyrYb<lCsu&&-mpqN%z$h53gxqvqsT`OS=LHVZ1;
rV`BEx6rP-})-w5nnk3h5pf*MzE)L!-tRBF~{gpw0F@mv36et7$XR;RX

diff --git a/osinaweb/osinacore/api/__pycache__/urls.cpython-313.pyc b/osinaweb/osinacore/api/__pycache__/urls.cpython-313.pyc
index 3ae4083ec1524d6ef97408f366bad8346d791f11..517924fbf4768a8374d1e99300ac93b9a3d5668e 100644
GIT binary patch
delta 172
zcmbQv@sC6OGcPX}0}w=(tj{Q6Vqka-;=lkel<_%lqq-v_M+~D9L$GiR_r!U!yduGD
zmdyGbMLg-Enqrd+7%z)eaTKK%<QJ6`>)&FBvivl8C%ZAt<q>j8%*?3_0!vT6%~Z=J
z12mWsh>H(TPGVlEbd!m#q3VLL>UCk=i^95>h4nXNUSx9kAjrwj)W}^V1yl$C%kwQE

delta 101
zcmeyzF`YyGGcPX}0}x!3TAyLW#K7<v#DM`GDC4usMs-I<4t@3_?sQ>Ik;$_dFEjgT
n@=R`KnmgHqxs*!^sE!eci`P!x%)FB413w2pQzLhg1W*V72>%ql

diff --git a/osinaweb/osinacore/api/__pycache__/views.cpython-313.pyc b/osinaweb/osinacore/api/__pycache__/views.cpython-313.pyc
index 39a4d5462e1a7996a4a689415efda04386b1f4ec..210318d18519edd87c2bc46402c5babc10337a79 100644
GIT binary patch
delta 460
zcmca@yx4;8GcPX}0}w1PS)VbNZz7)r<G+dOFQp_Hlo*1=q!@z5W0*{tK?)cciiFZ7
zG$l8SFcyeU77;KP6>>?;%&81YEyyn_aSZSb%S<hQ*)jRPkR;nQpz5g%lN$xBg_)w+
z!J2_YC{r+FFq0+IWCvyusXXRrZny+<G!Kj&#5egOpKv|1C6fw+CW~K4kv>qShz&?+
za@^uZvav`IBq0POZiylZ2d5TgCgx;Tr4|*5fE2KT2#^zsWPpSwOOY&yEe9lSai@UX
zUj%kPSaC56P*?#7ib9n^s#HL##E=Y!`cf}FwWJd$S8NR=8W^64DP9-TyeOu5T}=0)
znC@jU{SNLs{3;8gH<VoDx4F*mc#+?+gXIao_~bJp25QwHlR-oW$OMqf+8Dkvv9ekg
zsljCYG=(R(OKfMXo@^y4%LP)$2vS=&IZ?7e><a@IqvaPVHb%=C;$Inn6j&bs7;|mn

delta 96
zcmZ2%aod>hGcPX}0}#BGTA#6+cOstz<BN&vFIm#XG{rY-F&2n3`)LYI-Y2zPSskdT
pNDV|N1BqK4Ho5sJr8%i~MGZhMBM=uCO`a=V!1a}Zi_sFS5C9c$7{LGl

diff --git a/osinaweb/osinacore/api/serializers.py b/osinaweb/osinacore/api/serializers.py
index c9439b74..b0093d24 100644
--- a/osinaweb/osinacore/api/serializers.py
+++ b/osinaweb/osinacore/api/serializers.py
@@ -183,4 +183,23 @@ class TaskSerializer(serializers.ModelSerializer):
 
     def get_duration(self, obj):
         hours, minutes, seconds = obj.total_task_time()
-        return f"{str(hours).zfill(2)}:{str(minutes).zfill(2)}:{str(seconds).zfill(2)}"
\ No newline at end of file
+        return f"{str(hours).zfill(2)}:{str(minutes).zfill(2)}:{str(seconds).zfill(2)}"
+    
+
+
+class DailyReportSerializer(serializers.ModelSerializer):
+    staff = StaffProfileSerializer(read_only=True)
+    date = serializers.SerializerMethodField()
+
+
+    class Meta:
+        model = DailyReport
+        fields = "__all__"
+
+
+    def get_date(self, obj):
+        try:
+            # Combine the date and time strings into one datetime object
+            return datetime.strptime(f"{obj.date} {obj.time}", "%Y-%m-%d %I:%M %p")
+        except Exception:
+            return None
\ No newline at end of file
diff --git a/osinaweb/osinacore/api/urls.py b/osinaweb/osinacore/api/urls.py
index 7598cb6c..3ea93523 100644
--- a/osinaweb/osinacore/api/urls.py
+++ b/osinaweb/osinacore/api/urls.py
@@ -10,4 +10,5 @@ urlpatterns = [
   path("milestones/", MileStoneAPIView.as_view(), name="milestones"),
   path("userstories/", UserStoryAPIView.as_view(), name="userstories"),
   path('tasks/<int:project_id>/', TaskAPIView.as_view(), name='project-tasks'),
+  path("reports/", DailyReportAPIView.as_view(), name="reports"),
 ]
\ No newline at end of file
diff --git a/osinaweb/osinacore/api/views.py b/osinaweb/osinacore/api/views.py
index ac7baad0..e4d608e2 100644
--- a/osinaweb/osinacore/api/views.py
+++ b/osinaweb/osinacore/api/views.py
@@ -130,4 +130,13 @@ class TaskAPIView(APIView):
         tasks = Task.objects.filter(project=project)
         data = TaskSerializer(tasks, many=True).data
 
+        return Response(data, status=status.HTTP_200_OK)
+    
+
+class DailyReportAPIView(APIView):
+    def get(self, request):
+
+        dailyreport = DailyReport.objects.all()
+        data = DailyReportSerializer(dailyreport, many=True).data
+
         return Response(data, status=status.HTTP_200_OK)
\ No newline at end of file