Syntax fix

framgia · Nov 18, 2024 · 88ff52b · 88ff52b
1 parent f24047f
commit 88ff52b
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 5 deletions.
diff --git a/client/src/pages/notifications.tsx b/client/src/pages/notifications.tsx
@@ -79,11 +79,7 @@ const Notifications: NextPage = (): JSX.Element => {
           managerRemarks: parsedData.ManagerRemarks,
           startDate: parsedData.StartDate,
           endDate: parsedData.EndDate,
-          leaveType:
-            notificationType === NOTIFICATION_TYPE.LEAVE ||
-            notificationType === NOTIFICATION_TYPE.LEAVE_RESOLVED
-              ? parsedData.LeaveType
-              : null,
+          leaveType: parsedData.LeaveType ? parsedData.LeaveType : null,
           overtimeId: parsedData.OvertimeId,
           managerApproveStatus:
             parsedData.ManagerApproveStatus === RequestStatus.APPROVED

diff --git a/sph-hris.sln b/sph-hris.sln
@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.5.002.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "api", "api\api.csproj", "{74C9E6D2-5E3C-4744-AD99-9A8A1B19B171}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{74C9E6D2-5E3C-4744-AD99-9A8A1B19B171}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{74C9E6D2-5E3C-4744-AD99-9A8A1B19B171}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{74C9E6D2-5E3C-4744-AD99-9A8A1B19B171}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{74C9E6D2-5E3C-4744-AD99-9A8A1B19B171}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {FAB6F722-578B-433A-98F9-D70F5BAC9E88}
+	EndGlobalSection
+EndGlobal