diff --git a/lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart b/lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
index b780589..ea9d0a4 100644
--- a/lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
+++ b/lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
@@ -532,11 +532,20 @@ class _DynamicInputScreenState extends State<DynamicInputScreen> {
             isEnable: false,
             onTap: () async {
               if ((getEitDffStructureList![index].eSERVICESDV?.pVALUECOLUMNNAME != null)) {
+                // if (getEitDffStructureList![index].isDefaultTypeIsCDPS) {
+                //   selectedDate = DateFormat("yyyy/MM/dd", "en_US").parse(getEitDffStructureList![index].eSERVICESDV!.pVALUECOLUMNNAME!.replaceAll('/"', '').replaceAll(" 00:00:00", ""));
+                // } else {
+                //   selectedDate = DateTime.parse(getEitDffStructureList![index].eSERVICESDV!.pVALUECOLUMNNAME!);
+                // }
                 if (getEitDffStructureList![index].isDefaultTypeIsCDPS) {
-                  selectedDate = DateFormat("yyyy/MM/dd", "en_US").parse(getEitDffStructureList![index].eSERVICESDV!.pVALUECOLUMNNAME!.replaceAll('/"', '').replaceAll(" 00:00:00", ""));
-                } else {
-                  selectedDate = DateTime.parse(getEitDffStructureList![index].eSERVICESDV!.pVALUECOLUMNNAME!);
+                  if (displayText.contains(" 00:00:00")) {
+                    displayText = displayText.replaceAll(" 00:00:00", "");
+                  }
+                  if (displayText.contains("/")) {
+                    displayText = DateFormat('yyyy-MM-dd', "en_US").format(DateFormat("yyyy/MM/dd", "en_US").parse(displayText));
+                  }
                 }
+
               }
               DateTime date = await _selectDate(context);
               String dateString = date.toString().split(' ').first;