Jelajahi Sumber

small fixes for edit_in_trips

Viktoriia 1 bulan lalu
induk
melakukan
92e199529d

+ 1 - 0
src/modules/api/myRegions/regions-api.tsx

@@ -96,6 +96,7 @@ export interface PostGetRegionsReturn extends ResponseType {
       name: string;
       name: string;
       no_of_visits: number | null;
       no_of_visits: number | null;
       future: 0 | 1;
       future: 0 | 1;
+      edit_in_trips: 0 | 1;
     }[];
     }[];
     tcc: {
     tcc: {
       flag1: string;
       flag1: string;

+ 2 - 0
src/modules/api/regions/regions-api.tsx

@@ -12,6 +12,7 @@ export interface PostGetUserDataReturn extends ResponseType {
   no_of_visits: number;
   no_of_visits: number;
   best_visit_quality: number;
   best_visit_quality: number;
   bbox: any;
   bbox: any;
+  edit_in_trips: 0 | 1;
 }
 }
 
 
 export interface PostGetUserDataDareReturn extends ResponseType {
 export interface PostGetUserDataDareReturn extends ResponseType {
@@ -29,6 +30,7 @@ export interface PostGetRegionDataReturn extends ResponseType {
     first_visit_year: number;
     first_visit_year: number;
     last_visit_year: number;
     last_visit_year: number;
     no_of_visits: number;
     no_of_visits: number;
+    edit_in_trips: 0 | 1;
     photos: {
     photos: {
       title: string;
       title: string;
       id: number;
       id: number;

+ 3 - 1
src/screens/InAppScreens/TravelsScreen/Components/MyRegionsItems/NmRegionItem.tsx

@@ -125,7 +125,9 @@ export const NmRegionItem = React.memo(
               <TouchableOpacity
               <TouchableOpacity
                 style={[
                 style={[
                   styles.btn,
                   styles.btn,
-                  item.visits > 0 || item.edit_in_trips === 1 ? styles.visitedButton : styles.markVisitedButton
+                  item.visits > 0 || item.edit_in_trips === 1
+                    ? styles.visitedButton
+                    : styles.markVisitedButton
                 ]}
                 ]}
                 onPress={() => {
                 onPress={() => {
                   if (item.edit_in_trips === 1) {
                   if (item.edit_in_trips === 1) {

+ 4 - 2
src/screens/InAppScreens/TravelsScreen/EditCountryDataScreen/index.tsx

@@ -157,7 +157,8 @@ const EditCountryDataScreen = ({ route }: { route: any }) => {
           year: region.first_visited_in_year || null,
           year: region.first_visited_in_year || null,
           last: region.last_visited_in_year || null,
           last: region.last_visited_in_year || null,
           visits: region.no_of_visits || 0,
           visits: region.no_of_visits || 0,
-          future: region.future
+          future: region.future,
+          edit_in_trips: region.edit_in_trips
         }))
         }))
       );
       );
       setDataLoaded(true);
       setDataLoaded(true);
@@ -192,7 +193,8 @@ const EditCountryDataScreen = ({ route }: { route: any }) => {
           last_visit_year: item.last,
           last_visit_year: item.last,
           no_of_visits: item.visits,
           no_of_visits: item.visits,
           visited: item.visits > 0,
           visited: item.visits > 0,
-          future: item.future
+          future: item.future,
+          edit_in_trips: item.edit_in_trips
         });
         });
         navigation.navigate(
         navigation.navigate(
           ...([
           ...([

+ 4 - 2
src/screens/InAppScreens/TravelsScreen/RegionsScreen/index.tsx

@@ -153,7 +153,8 @@ const RegionsScreen = () => {
           year: region.first_visited_in_year || null,
           year: region.first_visited_in_year || null,
           last: region.last_visited_in_year || null,
           last: region.last_visited_in_year || null,
           visits: region.no_of_visits || 0,
           visits: region.no_of_visits || 0,
-          future: region.future
+          future: region.future,
+          edit_in_trips: region.edit_in_trips
         }))
         }))
       );
       );
       setTccRegions(regionsQe.data.tcc);
       setTccRegions(regionsQe.data.tcc);
@@ -232,7 +233,8 @@ const RegionsScreen = () => {
           last_visit_year: item.last,
           last_visit_year: item.last,
           no_of_visits: item.visits,
           no_of_visits: item.visits,
           visited: item.visits > 0,
           visited: item.visits > 0,
-          future: item.future
+          future: item.future,
+          edit_in_trips: item.edit_in_trips
         });
         });
         navigation.navigate(
         navigation.navigate(
           ...([
           ...([