Merge pull request #150 from CodeHive-Solutions/dev

Update Deployment Workflow and Enhance Vacation Request Handling
CodeHive-Solutions · Dec 12, 2024 · d6b1817 · d6b1817
2 parents 946d841 + 062a55c
commit d6b1817
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 12 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -47,5 +47,5 @@ jobs:
       - name: Deploy to server
         run: |
           rm -rf /var/www/INSIGHTS/frontend/dist/*
-          cp -r ./frontend/dist/* /var/www/INSIGHTS/frontend/dist
+          cp -r ./dist/* /var/www/INSIGHTS/frontend/dist
           sudo systemctl restart nginx
diff --git a/INSIGHTSAPI/vacation/models.py b/INSIGHTSAPI/vacation/models.py
@@ -58,12 +58,16 @@ class Meta:
     @property
     def duration(self):
         """Return the duration of the vacation request."""
-        return get_working_days(self.start_date, self.end_date, self.sat_is_working)
+        if self.pk:
+            return get_working_days(self.start_date, self.end_date, self.sat_is_working)
+        return None
 
     @property
     def return_date(self):
         """Return the return date of the vacation request."""
-        return get_return_date(self.end_date, self.sat_is_working)
+        if self.pk:
+            return get_return_date(self.end_date, self.sat_is_working)
+        return None
 
     def __str__(self):
         return f"{self.user} - {self.start_date} - {self.end_date}"

diff --git a/INSIGHTSAPI/vacation/serializers.py b/INSIGHTSAPI/vacation/serializers.py
@@ -54,6 +54,8 @@ def to_representation(self, instance):
         data = super().to_representation(instance)
         data["username"] = instance.user.get_full_name()
         data["user_id"] = instance.user.id
+        if "request" in self.context and self.context["request"].user.has_perm("vacation.payroll_approval"):
+            data["cedula"] = instance.user.cedula
         data.pop("manager_approved_at")
         data.pop("hr_approved_at")
         data.pop("payroll_approved_at")

diff --git a/INSIGHTSAPI/vacation/tests.py b/INSIGHTSAPI/vacation/tests.py
@@ -189,6 +189,15 @@ def test_vacation_list_manager_multiple_areas(self):
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(len(response.data), 2)
 
+    def test_vacation_list_payroll(self):
+        """Test listing all vacations endpoint for payroll."""
+        self.user.user_permissions.add(self.permission)
+        VacationRequest.objects.create(**self.vacation_request_user)
+        VacationRequest.objects.create(**self.vacation_request_user)
+        response = self.client.get(reverse("vacation-list"))
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(len(response.data), 2)
+
     def test_vacation_list_hr(self):
         """Test listing all vacations endpoint for HR."""
         self.user.job_position.name = "GERENTE DE GESTION HUMANA"

diff --git a/frontend/src/components/common/Footer.jsx b/frontend/src/components/common/Footer.jsx
@@ -32,6 +32,7 @@ const Footer = () => {
         >
             <Box sx={{ display: 'flex', flexDirection: 'Column', gap: '15px' }}>
                 <img
+                    loading="lazy"
                     alt="logo-cyc"
                     onClick={() =>
                         window.open('https://cyc-bpo.com/', '_blank')

diff --git a/frontend/src/components/common/NavBar.jsx b/frontend/src/components/common/NavBar.jsx
@@ -266,6 +266,9 @@ const Navbar = () => {
                 className="navbar"
                 sx={{
                     backdropFilter: 'blur(10px)',
+                    position: 'sticky',
+                    top: 0,
+                    zIndex: 1001,
                 }}
             >
                 <Box
@@ -282,7 +285,7 @@ const Navbar = () => {
                             alt="logo-cyc-navbar"
                             style={{ cursor: 'pointer' }}
                             width={110}
-                            height={55}
+                            height={56}
                             src={companyLogo}
                             onClick={() => navigate('/logged/home')}
                         />

diff --git a/frontend/src/components/pages/Home.jsx b/frontend/src/components/pages/Home.jsx
@@ -15,15 +15,13 @@ import { Typography, Box, Container, Card } from '@mui/material';
 // Media
 const benefit = `${getApiUrl().apiUrl}static/images/benefits/benefit-1.webp`;
 const cake = `${getApiUrl().apiUrl}static/images/birthdays/cake.webp`;
-const AvatarImage = `${getApiUrl().apiUrl}static/birthdays/avatar.webp`;
+const AvatarImage = `${getApiUrl().apiUrl}static/images/birthdays/avatar.webp`;
 const fultbolVideo = `${getApiUrl().apiUrl}static/videos/futbol.mp4`;
 const pointsVideo = `${getApiUrl().apiUrl}static/videos/points.mp4`;
 
 // Libraries
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 
-const benefits = [{ image: benefit, title: 'befenit' }];
-
 const Home = () => {
     const [todayBirthdays, setTodayBirthdays] = useState([]);
     const [yesterdayBirthdays, setYesterdayBirthdays] = useState([]);
@@ -450,10 +448,13 @@ const Home = () => {
                     >
                         Beneficios
                     </Typography>
-                    <CarouselComponent
-                        items={benefits}
-                        height={'960px'}
-                        width={'540px'}
+                    <img
+                        loading="lazy"
+                        style={{ borderRadius: '1rem' }}
+                        width={540}
+                        height={960}
+                        src={benefit}
+                        alt="beneficio"
                     />
                 </Box>
             </Box>

diff --git a/frontend/src/components/pages/vacations/Vacations.jsx b/frontend/src/components/pages/vacations/Vacations.jsx
@@ -145,6 +145,12 @@ export const Vacations = () => {
     };
 
     const columns = [
+        {
+            field: 'cedula',
+            headerName: 'Cedula',
+            width: 110,
+            type: 'text',
+        },
         {
             field: 'start_date',
             headerName: 'Fecha inicio',
@@ -606,7 +612,7 @@ export const Vacations = () => {
     };
 
     const handleCloseDialogPayslip = () => {
-        setOpenDialogPayslip(false);    
+        setOpenDialogPayslip(false);
         setOpenObservationsInput(false);
         setButtonType('button');
     };