From efd2e0b6b70f151d9240cc2d1e31b09385f6dab2 Mon Sep 17 00:00:00 2001
From: JOSEPH LE <joseph.le@apactech.io>
Date: Tue, 24 Sep 2024 16:03:28 +0700
Subject: [PATCH 1/2] update some UI

---
 .../src/pages/SprintReview/SprintReview.tsx   | 25 +++++++++++--------
 .../pages/StaffEvaluation/StaffEvaluation.tsx |  6 +++--
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/FRONTEND/src/pages/SprintReview/SprintReview.tsx b/FRONTEND/src/pages/SprintReview/SprintReview.tsx
index 01cb9d5..8e1c47a 100644
--- a/FRONTEND/src/pages/SprintReview/SprintReview.tsx
+++ b/FRONTEND/src/pages/SprintReview/SprintReview.tsx
@@ -478,7 +478,9 @@ const SprintReview = () => {
             criteriaSprint.length == 0 || loading ? { display: 'none' } : {}
           }
         >
-          Criteria for Sprint:
+          Criteria for Sprint: <Box fs={'italic'} fz={'sm'}>
+            <a href={`/test-report?projectID=${filter.projectID}&sprintID=${filter.sprintID}`} target='_blank'>Sprint test report</a>
+          </Box>
         </Title>
         <Box
           style={{
@@ -506,17 +508,17 @@ const SprintReview = () => {
         >
           <Table.Thead>
             <Table.Tr bg="#228be66b" style={rowStyle}>
-              <Table.Th style={{ textAlign: 'center', width: '250px' }}>
+              <Table.Th style={{ textAlign: 'center', width: '15%' }}>
                 Criteria
               </Table.Th>
-              <Table.Th style={{ textAlign: 'center', width: '250px' }}>
+              <Table.Th style={{ textAlign: 'center', width: '25%' }}>
                 Expect Result
               </Table.Th>
-              <Table.Th style={{ textAlign: 'center', width: '250px' }}>
+              <Table.Th style={{ textAlign: 'center', width: '25%' }}>
                 Actual Result
               </Table.Th>
-              <Table.Th style={{ textAlign: 'center' }}>Note</Table.Th>
-              <Table.Th style={{ textAlign: 'center', width: '100px' }}>
+              <Table.Th style={{ textAlign: 'center', width: '30%' }}>Note</Table.Th>
+              <Table.Th style={{ textAlign: 'center', width: '5%' }}>
                 Point
               </Table.Th>
             </Table.Tr>
@@ -599,6 +601,7 @@ const SprintReview = () => {
                     value={finalPoint}
                     onChange={(value) => setFinalPoint(value ?? '')}
                     size="xs"
+                    w={'40%'}
                     styles={() => ({
                       input: {
                         color: 'red',
@@ -639,17 +642,17 @@ const SprintReview = () => {
         >
           <Table.Thead>
             <Table.Tr bg="#228be66b" style={rowStyle}>
-              <Table.Th style={{ textAlign: 'center', width: '250px' }}>
+              <Table.Th style={{ textAlign: 'center', width: '15%' }}>
                 User
               </Table.Th>
-              <Table.Th style={{ textAlign: 'center', width: '250px' }}>
+              <Table.Th style={{ textAlign: 'center', width: '25%' }}>
                 Criteria
               </Table.Th>
-              <Table.Th style={{ textAlign: 'center' }}>Note</Table.Th>
-              <Table.Th style={{ textAlign: 'center', width: '250px' }}>
+              <Table.Th style={{ textAlign: 'center', width: '40%' }}>Note</Table.Th>
+              <Table.Th style={{ textAlign: 'center', width: '15%' }}>
                 Created by
               </Table.Th>
-              <Table.Th style={{ textAlign: 'center', width: '100px' }}>
+              <Table.Th style={{ textAlign: 'center', width: '5%' }}>
                 Point
               </Table.Th>
             </Table.Tr>
diff --git a/FRONTEND/src/pages/StaffEvaluation/StaffEvaluation.tsx b/FRONTEND/src/pages/StaffEvaluation/StaffEvaluation.tsx
index 996ae61..d928770 100644
--- a/FRONTEND/src/pages/StaffEvaluation/StaffEvaluation.tsx
+++ b/FRONTEND/src/pages/StaffEvaluation/StaffEvaluation.tsx
@@ -297,10 +297,11 @@ const StaffEvaluation = () => {
             User:
           </Text>
           <Select
-            style={{ width: '50%' }}
+            style={{ width: '30%' }}
             label={''}
             placeholder="Select user"
             maxLength={255}
+            size={'xs'}
             required
             data={listUsers.map((i: User) => ({
               value: i.id.toString(),
@@ -331,7 +332,6 @@ const StaffEvaluation = () => {
             w="100%"
             display={'flex'}
             mt={15}
-            style={{ justifyContent: 'space-evenly' }}
           >
             <Box display={'flex'} mr={10}>
               <Text
@@ -346,6 +346,7 @@ const StaffEvaluation = () => {
               <DateInput
                 placeholder="Select date"
                 clearable
+                size='xs'
                 required
                 label={''}
                 value={filter.fromDate ? new Date(filter.fromDate) : null}
@@ -366,6 +367,7 @@ const StaffEvaluation = () => {
               <DateInput
                 placeholder="Select date"
                 clearable
+                size='xs'
                 required
                 label={''}
                 value={filter.toDate ? new Date(filter.toDate) : null}

From c0826f814e76789a7da25c511964f8aa3517819e Mon Sep 17 00:00:00 2001
From: Truong Vo <41848815+vmtruong301296@users.noreply.github.com>
Date: Tue, 24 Sep 2024 16:18:03 +0700
Subject: [PATCH 2/2] =?UTF-8?q?Hi=E1=BB=87u=20ch=E1=BB=89nh=20api=20update?=
 =?UTF-8?q?=20technical?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Http/Controllers/TechnicalController.php  | 29 ++++++++++++++-----
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/BACKEND/Modules/Admin/app/Http/Controllers/TechnicalController.php b/BACKEND/Modules/Admin/app/Http/Controllers/TechnicalController.php
index 3ca7090..2e3cf74 100644
--- a/BACKEND/Modules/Admin/app/Http/Controllers/TechnicalController.php
+++ b/BACKEND/Modules/Admin/app/Http/Controllers/TechnicalController.php
@@ -221,16 +221,29 @@ class TechnicalController extends Controller
             'technicals.*.point' => 'required|integer|min:0|max:3', // Điểm trong khoảng [0-3]
         ]);
 
-        // Xóa hết các bản ghi hiện có của user trong bảng technical_users
-        TechnicalUser::where('user_id', $userInfo->id)->delete();
+        // Lấy danh sách technicals của user từ bảng TechnicalUser
+        $existingTechnicals = TechnicalUser::where('user_id', $userInfo->id)->get()->keyBy('technical_id');
 
-        // Duyệt qua mảng technicals và thêm mới dữ liệu
         foreach ($validatedData['technicals'] as $technical) {
-            TechnicalUser::create([
-                'user_id' => $userInfo->id,
-                'technical_id' => $technical['technical_id'],
-                'point' => $technical['point']
-            ]);
+            $existingTechnical = $existingTechnicals->get($technical['technical_id']);
+            // if ($technical['technical_id'] == 7) {
+            //     dd($existingTechnical,$userInfo);
+            // }
+            if ($existingTechnical) {
+                // Nếu technical_id đã tồn tại và point khác, thì update
+                if ($existingTechnical->point !== $technical['point']) {
+                    $existingTechnical->update([
+                        'point' => $technical['point']
+                    ]);
+                }
+            } else {
+                // Nếu technical_id chưa tồn tại, tạo mới
+                TechnicalUser::create([
+                    'user_id' => $userInfo->id,
+                    'technical_id' => $technical['technical_id'],
+                    'point' => $technical['point']
+                ]);
+            }
         }
 
         return AbstractController::ResultSuccess('Technicals for user updated successfully.');