Merge pull request #752 from stasgm/old_selectors

chore: auto saving
stasgm · Feb 20, 2024 · 1f5809a · 1f5809a
2 parents 70a1e3b + 6040dc1
commit 1f5809a
Show file tree

Hide file tree

Showing 43 changed files with 638 additions and 277 deletions.
diff --git a/apps/app-fp-movement/app.json b/apps/app-fp-movement/app.json
@@ -2,7 +2,7 @@
   "expo": {
     "name": "GDMN Отгрузка",
     "slug": "gdmn-fp-movement",
-    "version": "0.4.4",
+    "version": "0.4.6",
     "githubUrl": "https://github.com/stasgm/gdmn-mob",
     "orientation": "default",
     "icon": "./assets/icon.png",
@@ -26,7 +26,7 @@
     "android": {
       "package": "com.gsbelarus.fpmovement",
       "permissions": ["CAMERA", "VIBRATE"],
-      "versionCode": 36
+      "versionCode": 38
     },
     "web": {
       "favicon": "./assets/favicon.png"

diff --git a/apps/app-fp-movement/src/screens/FreeShipment/FreeShipmentListScreen.tsx b/apps/app-fp-movement/src/screens/FreeShipment/FreeShipmentListScreen.tsx
@@ -86,6 +86,7 @@ export const FreeShipmentListScreen = () => {
             </View>
           ),
           sentDate: i.sentDate,
+          erpCreationDate: i.erpCreationDate,
         }) as IListItemProps,
     );
   }, [list, status, sortDateType.id]);

diff --git a/apps/app-fp-movement/src/screens/FreeShipment/FreeShipmentViewScreen.tsx b/apps/app-fp-movement/src/screens/FreeShipment/FreeShipmentViewScreen.tsx
@@ -114,9 +114,9 @@ export const FreeShipmentViewScreen = () => {
 
   const goodRemains = useMemo<IRemGood[]>(() => {
     return doc?.head?.fromDepart?.id && isFocused && remains
-      ? getRemGoodListByContact(goods, remains[doc.head.fromDepart.id], docList, doc.head.fromDepart.id)
+      ? getRemGoodListByContact(goods, remains[doc.head.fromDepart.id] /*, docList, doc.head.fromDepart.id*/)
       : [];
-  }, [doc?.head?.fromDepart?.id, goods, remains, docList, isFocused]);
+  }, [doc?.head?.fromDepart?.id, goods, remains, isFocused]);
 
   const [screenState, setScreenState] = useState<ScreenState>('idle');
   const [visibleDialog, setVisibleDialog] = useState(false);
@@ -503,6 +503,8 @@ export const FreeShipmentViewScreen = () => {
     [doc?.status, handlePressLine, lines?.length],
   );
 
+  const [isDateVisible, setIsDateVisible] = useState(false);
+
   const [scanned, setScanned] = useState(false);
 
   const handleErrorMessage = useCallback((visible: boolean, text: string) => {
@@ -656,6 +658,8 @@ export const FreeShipmentViewScreen = () => {
     }
   }, [navigation, screenState]);
 
+  const isEditable = useMemo(() => (doc ? ['DRAFT', 'READY'].includes(doc?.status) : false), [doc]);
+
   const viewStyle: StyleProp<ViewStyle> = useMemo(
     () => ({ ...styles.container, justifyContent: lineType === 'last' ? 'flex-start' : 'center' }),
     [lineType],
@@ -695,20 +699,33 @@ export const FreeShipmentViewScreen = () => {
       <InfoBlock
         colorLabel={getStatusColor(doc?.status || 'DRAFT')}
         title={doc.documentType.description || ''}
-        onPress={handleEditDocHead}
-        disabled={!['DRAFT', 'READY'].includes(doc.status)}
         isBlocked={isBlocked}
+        onPress={() => (isEditable ? handleEditDocHead() : setIsDateVisible(!isDateVisible))}
+        editable={isEditable}
       >
         <View style={styles.infoBlock}>
           <MediumText>{doc.head.fromDepart?.name || ''}</MediumText>
           <MediumText>{`№ ${doc.number} от ${getDateString(doc.documentDate)}`}</MediumText>
-          {doc.sentDate ? (
-            <View style={styles.rowCenter}>
-              <MediumText>
-                Отправлено: {getDateString(doc.sentDate)} {new Date(doc.sentDate).toLocaleTimeString()}
-              </MediumText>
-            </View>
-          ) : null}
+          {isDateVisible && (
+            <>
+              {doc.sentDate ? (
+                <View style={styles.rowCenter}>
+                  <MediumText>
+                    Отправлено: {getDateString(doc.sentDate)}{' '}
+                    {new Date(doc.sentDate).toLocaleTimeString('ru', { hour12: false })}
+                  </MediumText>
+                </View>
+              ) : null}
+              {doc.erpCreationDate ? (
+                <View style={styles.rowCenter}>
+                  <MediumText>
+                    Обработано: {getDateString(doc.erpCreationDate)}{' '}
+                    {new Date(doc.erpCreationDate).toLocaleTimeString('ru', { hour12: false })}
+                  </MediumText>
+                </View>
+              ) : null}
+            </>
+          )}
         </View>
       </InfoBlock>
       <LineTypes />

diff --git a/apps/app-fp-movement/src/screens/Inventory/InventoryListScreen.tsx b/apps/app-fp-movement/src/screens/Inventory/InventoryListScreen.tsx
@@ -75,6 +75,7 @@ export const InventoryListScreen = () => {
           lineCount: i.lines.length,
           errorMessage: i.errorMessage,
           sentDate: i.sentDate,
+          erpCreationDate: i.erpCreationDate,
         }) as IListItemProps,
     );
   }, [status, list]);

diff --git a/apps/app-fp-movement/src/screens/Inventory/InventoryViewScreen.tsx b/apps/app-fp-movement/src/screens/Inventory/InventoryViewScreen.tsx
@@ -436,6 +436,8 @@ export const InventoryViewScreen = () => {
     [doc?.head.fromDepart?.isAddressStore, doc?.status, handlePressLine, lines?.length],
   );
 
+  const [isDateVisible, setIsDateVisible] = useState(false);
+
   const [scanned, setScanned] = useState(false);
 
   const ref = useRef<TextInput>(null);
@@ -582,6 +584,8 @@ export const InventoryViewScreen = () => {
     }
   }, [navigation, screenState]);
 
+  const isEditable = useMemo(() => (doc ? ['DRAFT', 'READY'].includes(doc?.status) : false), [doc]);
+
   const isFocused = useIsFocused();
   if (!isFocused) {
     return <AppActivityIndicator />;
@@ -617,20 +621,33 @@ export const InventoryViewScreen = () => {
       <InfoBlock
         colorLabel={getStatusColor(doc?.status || 'DRAFT')}
         title={doc.documentType.description || ''}
-        onPress={handleEditDocHead}
-        disabled={!['DRAFT', 'READY'].includes(doc.status)}
+        onPress={() => (isEditable ? handleEditDocHead() : setIsDateVisible(!isDateVisible))}
+        editable={isEditable}
         isBlocked={isBlocked}
       >
         <View style={styles.infoBlock}>
           <MediumText>{doc.head.fromDepart?.name || ''}</MediumText>
           <MediumText>{`№ ${doc.number} от ${getDateString(doc.documentDate)}`}</MediumText>
-          {doc.sentDate ? (
-            <View style={styles.rowCenter}>
-              <MediumText>
-                Отправлено: {getDateString(doc.sentDate)} {new Date(doc.sentDate).toLocaleTimeString()}
-              </MediumText>
-            </View>
-          ) : null}
+          {isDateVisible && (
+            <>
+              {doc.sentDate ? (
+                <View style={styles.rowCenter}>
+                  <MediumText>
+                    Отправлено: {getDateString(doc.sentDate)}{' '}
+                    {new Date(doc.sentDate).toLocaleTimeString('ru', { hour12: false })}
+                  </MediumText>
+                </View>
+              ) : null}
+              {doc.erpCreationDate ? (
+                <View style={styles.rowCenter}>
+                  <MediumText>
+                    Обработано: {getDateString(doc.erpCreationDate)}{' '}
+                    {new Date(doc.erpCreationDate).toLocaleTimeString('ru', { hour12: false })}
+                  </MediumText>
+                </View>
+              ) : null}
+            </>
+          )}
         </View>
       </InfoBlock>
       <LineTypes />

diff --git a/apps/app-fp-movement/src/screens/Laboratory/LaboratoryListScreen.tsx b/apps/app-fp-movement/src/screens/Laboratory/LaboratoryListScreen.tsx
@@ -75,6 +75,7 @@ export const LaboratoryListScreen = () => {
           lineCount: i.lines.length,
           errorMessage: i.errorMessage,
           sentDate: i.sentDate,
+          erpCreationDate: i.erpCreationDate,
         }) as IListItemProps,
     );
   }, [status, list]);

diff --git a/apps/app-fp-movement/src/screens/Laboratory/LaboratoryViewScreen.tsx b/apps/app-fp-movement/src/screens/Laboratory/LaboratoryViewScreen.tsx
@@ -105,9 +105,9 @@ export const LaboratoryViewScreen = () => {
 
   const goodRemains = useMemo<IRemGood[]>(() => {
     return doc?.head?.fromDepart?.id && isFocused && remains
-      ? getRemGoodListByContact(goods, remains[doc.head.fromDepart.id], docList, doc.head.fromDepart.id)
+      ? getRemGoodListByContact(goods, remains[doc.head.fromDepart.id] /*, docList, doc.head.fromDepart.id*/)
       : [];
-  }, [doc?.head?.fromDepart?.id, docList, goods, isFocused, remains]);
+  }, [doc?.head.fromDepart.id, goods, isFocused, remains]);
 
   const [screenState, setScreenState] = useState<ScreenState>('idle');
   const [visibleDialog, setVisibleDialog] = useState(false);
@@ -458,6 +458,8 @@ export const LaboratoryViewScreen = () => {
     [doc?.status, lines?.length],
   );
 
+  const [isDateVisible, setIsDateVisible] = useState(false);
+
   const [scanned, setScanned] = useState(false);
 
   const ref = useRef<TextInput>(null);
@@ -597,6 +599,8 @@ export const LaboratoryViewScreen = () => {
     }
   }, [navigation, screenState]);
 
+  const isEditable = useMemo(() => (doc ? ['DRAFT', 'READY'].includes(doc?.status) : false), [doc]);
+
   const viewStyle: StyleProp<ViewStyle> = useMemo(
     () => ({ ...styles.container, justifyContent: lineType === 'last' ? 'flex-start' : 'center' }),
     [lineType],
@@ -636,20 +640,33 @@ export const LaboratoryViewScreen = () => {
       <InfoBlock
         colorLabel={getStatusColor(doc?.status || 'DRAFT')}
         title={doc.documentType.description || ''}
-        onPress={handleEditDocHead}
-        disabled={!['DRAFT', 'READY'].includes(doc.status)}
+        onPress={() => (isEditable ? handleEditDocHead() : setIsDateVisible(!isDateVisible))}
+        editable={isEditable}
         isBlocked={isBlocked}
       >
         <View style={styles.infoBlock}>
           <MediumText>{doc.head.fromDepart?.name || ''}</MediumText>
           <MediumText>{`№ ${doc.number} от ${getDateString(doc.documentDate)}`}</MediumText>
-          {doc.sentDate ? (
-            <View style={styles.rowCenter}>
-              <MediumText>
-                Отправлено: {getDateString(doc.sentDate)} {new Date(doc.sentDate).toLocaleTimeString()}
-              </MediumText>
-            </View>
-          ) : null}
+          {isDateVisible && (
+            <>
+              {doc.sentDate ? (
+                <View style={styles.rowCenter}>
+                  <MediumText>
+                    Отправлено: {getDateString(doc.sentDate)}{' '}
+                    {new Date(doc.sentDate).toLocaleTimeString('ru', { hour12: false })}
+                  </MediumText>
+                </View>
+              ) : null}
+              {doc.erpCreationDate ? (
+                <View style={styles.rowCenter}>
+                  <MediumText>
+                    Обработано: {getDateString(doc.erpCreationDate)}{' '}
+                    {new Date(doc.erpCreationDate).toLocaleTimeString('ru', { hour12: false })}
+                  </MediumText>
+                </View>
+              ) : null}
+            </>
+          )}
         </View>
       </InfoBlock>
       <LineTypes />

diff --git a/apps/app-fp-movement/src/screens/MovementFrom/MoveFromListScreen.tsx b/apps/app-fp-movement/src/screens/MovementFrom/MoveFromListScreen.tsx
@@ -85,6 +85,7 @@ export const MoveFromListScreen = () => {
             </View>
           ),
           sentDate: i.sentDate,
+          erpCreationDate: i.erpCreationDate,
         }) as IListItemProps,
     );
   }, [status, list]);

diff --git a/apps/app-fp-movement/src/screens/MovementFrom/MoveFromViewScreen.tsx b/apps/app-fp-movement/src/screens/MovementFrom/MoveFromViewScreen.tsx
@@ -115,9 +115,9 @@ export const MoveFromViewScreen = () => {
 
   const goodRemains = useMemo<IRemGood[]>(() => {
     return doc?.head?.fromDepart?.id && isFocused && remains
-      ? getRemGoodListByContact(goods, remains[doc.head.fromDepart.id], docList, doc.head.fromDepart.id)
+      ? getRemGoodListByContact(goods, remains[doc.head.fromDepart.id] /*, docList, doc.head.fromDepart.id*/)
       : [];
-  }, [doc?.head?.fromDepart?.id, docList, goods, isFocused, remains]);
+  }, [doc?.head?.fromDepart?.id, goods, isFocused, remains]);
 
   const handleFocus = () => {
     ref?.current?.focus();
@@ -447,6 +447,8 @@ export const MoveFromViewScreen = () => {
     [doc?.head.fromDepart?.isAddressStore, doc?.head.toDepart?.isAddressStore, doc?.status, lines?.length],
   );
 
+  const [isDateVisible, setIsDateVisible] = useState(false);
+
   const [scanned, setScanned] = useState(false);
 
   const ref = useRef<TextInput>(null);
@@ -607,6 +609,8 @@ export const MoveFromViewScreen = () => {
     }
   }, [navigation, screenState]);
 
+  const isEditable = useMemo(() => (doc ? ['DRAFT', 'READY'].includes(doc?.status) : false), [doc]);
+
   if (!isFocused) {
     return <AppActivityIndicator />;
   }
@@ -641,8 +645,8 @@ export const MoveFromViewScreen = () => {
       <InfoBlock
         colorLabel={getStatusColor(doc?.status || 'DRAFT')}
         title={doc.head.subtype.name || ''}
-        onPress={handleEditDocHead}
-        disabled={!['DRAFT', 'READY'].includes(doc.status)}
+        onPress={() => (isEditable ? handleEditDocHead() : setIsDateVisible(!isDateVisible))}
+        editable={isEditable}
         isBlocked={isBlocked}
       >
         <>
@@ -653,13 +657,26 @@ export const MoveFromViewScreen = () => {
           <View style={styles.rowCenter}>
             <MediumText>Куда: {doc.head.toDepart?.name || ''}</MediumText>
           </View>
-          {doc.sentDate ? (
-            <View style={styles.rowCenter}>
-              <MediumText>
-                Отправлено: {getDateString(doc.sentDate)} {new Date(doc.sentDate).toLocaleTimeString()}
-              </MediumText>
-            </View>
-          ) : null}
+          {isDateVisible && (
+            <>
+              {doc.sentDate ? (
+                <View style={styles.rowCenter}>
+                  <MediumText>
+                    Отправлено: {getDateString(doc.sentDate)}{' '}
+                    {new Date(doc.sentDate).toLocaleTimeString('ru', { hour12: false })}
+                  </MediumText>
+                </View>
+              ) : null}
+              {doc.erpCreationDate ? (
+                <View style={styles.rowCenter}>
+                  <MediumText>
+                    Обработано: {getDateString(doc.erpCreationDate)}{' '}
+                    {new Date(doc.erpCreationDate).toLocaleTimeString('ru', { hour12: false })}
+                  </MediumText>
+                </View>
+              ) : null}
+            </>
+          )}
         </>
       </InfoBlock>
       <LineTypes />

diff --git a/apps/app-fp-movement/src/screens/MovementTo/MoveToListScreen.tsx b/apps/app-fp-movement/src/screens/MovementTo/MoveToListScreen.tsx
@@ -85,6 +85,7 @@ export const MoveToListScreen = () => {
             </View>
           ),
           sentDate: i.sentDate,
+          erpCreationDate: i.erpCreationDate,
         }) as IListItemProps,
     );
   }, [status, list]);