Merge pull request fga-eps-mds#171 from Ronyell/CompleteReport

Concluir relatório
Ronyell · Apr 17, 2018 · 5537e00 · 5537e00
2 parents 943e8fd + 78fcdb3
commit 5537e00
Show file tree

Hide file tree

Showing 10 changed files with 90 additions and 33 deletions.
diff --git a/src/screens/reports/DocCheckoutScreen.js b/src/screens/reports/DocCheckoutScreen.js
@@ -24,15 +24,17 @@ export default class DocCheckoutScreen extends React.Component {
     BackHandler.removeEventListener('hardwareBackPress', backHandlerPop);
   }
 
-
   showPositiveCheckBox(item) {
     return (
       <View>
         <Checkbox
           checkboxStyle={styles.checklist.checkBoxStyle}
           selected={item.markedYes}
           selectedColor={'#008000'}
-          onSelect={() => this.props.setDocReportPositive(item.key)}
+          onSelect={() => {
+            this.props.setDocReportPositive(item.key);
+            this.props.setStatusDoc(false);
+          }}
           disabled={item.markedNo}
           disabledColor={null}
         />
@@ -47,7 +49,10 @@ export default class DocCheckoutScreen extends React.Component {
           checkboxStyle={styles.checklist.checkBoxStyle}
           selected={item.markedNo}
           selectedColor={'#B22222'}
-          onSelect={() => this.props.setDocReportNegative(item.key)}
+          onSelect={() => {
+            this.props.setDocReportNegative(item.key);
+            this.props.setStatusDoc(false);
+          }}
           disabled={item.markedYes}
           disabledColor={null}
         />

diff --git a/src/screens/reports/FoodHandlerCheckoutScreen.js b/src/screens/reports/FoodHandlerCheckoutScreen.js
@@ -31,7 +31,10 @@ export default class FoodHandlerCheckoutScreen extends React.Component {
           checkboxStyle={styles.checklist.checkBoxStyle}
           selected={item.markedYes}
           selectedColor={'#008000'}
-          onSelect={() => this.props.setFoodHandlerReportPositive(item.key)}
+          onSelect={() => {
+            this.props.setFoodHandlerReportPositive(item.key);
+            this.props.setStatusFoodHandler(false);
+          }}
           disabled={item.markedNo}
           disabledColor={null}
         />
@@ -46,7 +49,10 @@ export default class FoodHandlerCheckoutScreen extends React.Component {
           checkboxStyle={styles.checklist.checkBoxStyle}
           selected={item.markedNo}
           selectedColor={'#B22222'}
-          onSelect={() => this.props.setFoodHandlerReportNegative(item.key)}
+          onSelect={() => {
+            this.props.setFoodHandlerReportNegative(item.key);
+            this.props.setStatusFoodHandler(false);
+          }}
           disabled={item.markedYes}
           disabledColor={null}
         />

diff --git a/src/screens/reports/FoodPreparationCheckoutScreen.js b/src/screens/reports/FoodPreparationCheckoutScreen.js
@@ -31,7 +31,10 @@ export default class FoodPreparationCheckoutScreen extends React.Component {
           checkboxStyle={styles.checklist.checkBoxStyle}
           selected={item.markedYes}
           selectedColor={'#008000'}
-          onSelect={() => this.props.setFoodPreparationReportPositive(item.key)}
+          onSelect={() => {
+            this.props.setFoodPreparationReportPositive(item.key);
+            this.props.setStatusFoodPreparation(false);
+          }}
           disabled={item.markedNo}
           disabledColor={null}
         />
@@ -46,7 +49,10 @@ export default class FoodPreparationCheckoutScreen extends React.Component {
           checkboxStyle={styles.checklist.checkBoxStyle}
           selected={item.markedNo}
           selectedColor={'#B22222'}
-          onSelect={() => this.props.setFoodPreparationReportNegative(item.key)}
+          onSelect={() => {
+            this.props.setFoodPreparationReportNegative(item.key);
+            this.props.setStatusFoodPreparation(false);
+          }}
           disabled={item.markedYes}
           disabledColor={null}
         />

diff --git a/src/screens/reports/FoodQualityCheckoutScreen.js b/src/screens/reports/FoodQualityCheckoutScreen.js
@@ -31,7 +31,10 @@ export default class FoodQualityCheckoutScreen extends React.Component {
           checkboxStyle={styles.checklist.checkBoxStyle}
           selected={item.markedYes}
           selectedColor={'#008000'}
-          onSelect={() => this.props.setFoodQualityReportPositive(item.key)}
+          onSelect={() => {
+            this.props.setFoodQualityReportPositive(item.key);
+            this.props.setStatusFoodQuality(false);
+          }}
           disabled={item.markedNo}
           disabledColor={null}
         />
@@ -46,7 +49,10 @@ export default class FoodQualityCheckoutScreen extends React.Component {
           checkboxStyle={styles.checklist.checkBoxStyle}
           selected={item.markedNo}
           selectedColor={'#B22222'}
-          onSelect={() => this.props.setFoodQualityReportNegative(item.key)}
+          onSelect={() => {
+            this.props.setFoodQualityReportNegative(item.key);
+            this.props.setStatusFoodQuality(false);
+          }}
           disabled={item.markedYes}
           disabledColor={null}
         />

diff --git a/src/screens/reports/KitchenCheckoutScreen.js b/src/screens/reports/KitchenCheckoutScreen.js
@@ -31,7 +31,10 @@ export default class KitchenCheckoutScreen extends React.Component {
           checkboxStyle={styles.checklist.checkBoxStyle}
           selected={item.markedYes}
           selectedColor={'#008000'}
-          onSelect={() => this.props.setKitchenReportPositive(item.key)}
+          onSelect={() => {
+            this.props.setKitchenReportPositive(item.key);
+            this.props.setStatusKitchen(false);
+          }}
           disabled={item.markedNo}
           disabledColor={null}
         />
@@ -51,7 +54,10 @@ export default class KitchenCheckoutScreen extends React.Component {
           checkboxStyle={styles.checklist.checkBoxStyle}
           selected={item.markedNo}
           selectedColor={'#B22222'}
-          onSelect={() => this.props.setKitchenReportNegative(item.key)}
+          onSelect={() => {
+            this.props.setKitchenReportNegative(item.key);
+            this.props.setStatusKitchen(false);
+          }}
           disabled={item.markedYes}
           disabledColor={null}
         />

diff --git a/src/screens/reports/RefectoryCheckoutScreen.js b/src/screens/reports/RefectoryCheckoutScreen.js
@@ -31,7 +31,10 @@ export default class RefectoryCheckoutScreen extends React.Component {
           checkboxStyle={styles.checklist.checkBoxStyle}
           selected={item.markedYes}
           selectedColor={'#008000'}
-          onSelect={() => this.props.setRefectoryReportPositive(item.key)}
+          onSelect={() => {
+            this.props.setRefectoryReportPositive(item.key);
+            this.props.setStatusRefectory(false);
+          }}
           disabled={item.markedNo}
           disabledColor={null}
         />
@@ -46,7 +49,10 @@ export default class RefectoryCheckoutScreen extends React.Component {
           checkboxStyle={styles.checklist.checkBoxStyle}
           selected={item.markedNo}
           selectedColor={'#B22222'}
-          onSelect={() => this.props.setRefectoryReportNegative(item.key)}
+          onSelect={() => {
+            this.props.setRefectoryReportNegative(item.key);
+            this.props.setStatusRefectory(false);
+          }}
           disabled={item.markedYes}
           disabledColor={null}
         />

diff --git a/src/screens/reports/SchoolSurroundingsCheckoutScreen.js b/src/screens/reports/SchoolSurroundingsCheckoutScreen.js
@@ -31,7 +31,10 @@ export default class SchoolSurroundingsCheckoutScreen extends React.Component {
           checkboxStyle={styles.checklist.checkBoxStyle}
           selected={item.markedYes}
           selectedColor={'#008000'}
-          onSelect={() => this.props.setSchoolSurroundingsReportPositive(item.key)}
+          onSelect={() => {
+            this.props.setSchoolSurroundingsReportPositive(item.key);
+            this.props.setStatusSchoolSurroundings(false);
+          }}
           disabled={item.markedNo}
           disabledColor={null}
         />
@@ -46,7 +49,10 @@ export default class SchoolSurroundingsCheckoutScreen extends React.Component {
           checkboxStyle={styles.checklist.checkBoxStyle}
           selected={item.markedNo}
           selectedColor={'#B22222'}
-          onSelect={() => this.props.setSchoolSurroundingsReportNegative(item.key)}
+          onSelect={() => {
+            this.props.setSchoolSurroundingsReportNegative(item.key);
+            this.props.setStatusSchoolSurroundings(false);
+          }}
           disabled={item.markedYes}
           disabledColor={null}
         />

diff --git a/src/screens/reports/StockFoodCheckoutScreen.js b/src/screens/reports/StockFoodCheckoutScreen.js
@@ -32,7 +32,10 @@ export default class StockFoodCheckoutScreen extends React.Component {
           checkboxStyle={styles.checklist.checkBoxStyle}
           selected={item.markedYes}
           selectedColor={'#008000'}
-          onSelect={() => this.props.setStockFoodReportPositive(item.key)}
+          onSelect={() => {
+            this.props.setStockFoodReportPositive(item.key);
+            this.props.setStatusFoodStock(false);
+          }}
           disabled={item.markedNo}
           disabledColor={null}
         />
@@ -47,7 +50,10 @@ export default class StockFoodCheckoutScreen extends React.Component {
           checkboxStyle={styles.checklist.checkBoxStyle}
           selected={item.markedNo}
           selectedColor={'#B22222'}
-          onSelect={() => this.props.setStockFoodReportNegative(item.key)}
+          onSelect={() => {
+            this.props.setStockFoodReportNegative(item.key);
+            this.props.setStatusFoodStock(false);
+          }}
           disabled={item.markedYes}
           disabledColor={null}
         />

diff --git a/src/screens/reports/WaterSewerSupplyCheckoutScreen.js b/src/screens/reports/WaterSewerSupplyCheckoutScreen.js
@@ -31,7 +31,10 @@ export default class WaterSewerSupplyCheckoutScreen extends React.Component {
           checkboxStyle={styles.checklist.checkBoxStyle}
           selected={item.markedYes}
           selectedColor={'#008000'}
-          onSelect={() => this.props.setWaterSewerSupplyReportPositive(item.key)}
+          onSelect={() => {
+            this.props.setWaterSewerSupplyReportPositive(item.key);
+            this.props.setStatusWaterSewerSupply(false);
+          }}
           disabled={item.markedNo}
           disabledColor={null}
         />
@@ -46,7 +49,10 @@ export default class WaterSewerSupplyCheckoutScreen extends React.Component {
           checkboxStyle={styles.checklist.checkBoxStyle}
           selected={item.markedNo}
           selectedColor={'#B22222'}
-          onSelect={() => this.props.setWaterSewerSupplyReportNegative(item.key)}
+          onSelect={() => {
+            this.props.setWaterSewerSupplyReportNegative(item.key);
+            this.props.setStatusWaterSewerSupply(false);
+          }}
           disabled={item.markedYes}
           disabledColor={null}
         />

diff --git a/src/screens/startInspection/StartPendingInspection.js b/src/screens/startInspection/StartPendingInspection.js
@@ -230,29 +230,33 @@ class StartPendingInspection extends React.Component {
           <View style={{ flex: 3 }}>
             {this.verification(visitSchedule.content.visitListOfInvitees, visitSchedule)}
             {
-              Object.keys(visitSchedule.content.visitListOfInvitees).length > 1 ?
-                this.renderPaticipantsButton(visitSchedule) : undefined
+              this.renderPaticipantsButton(
+                visitSchedule,
+                Object.keys(visitSchedule.content.visitListOfInvitees).length)
             }
           </View>
         </View>
       ))
     );
   }
 
-  renderPaticipantsButton(visitSchedule) {
-    return (
-      <View style={styles.buttonInvitees}>
-        <TouchableOpacity
-          onPress={() =>
-            this.mountvisitListOfInvitees(visitSchedule.content.visitListOfInvitees)}
-        >
-          <Text style={styles.buttonText}>PARTICIPANTES</Text>
-        </TouchableOpacity>
-      </View>
-    );
+  renderPaticipantsButton(visitSchedule, numberOfParticipants) {
+    let participantsButton;
+    if (numberOfParticipants > 1) {
+      participantsButton = (
+        <View style={styles.buttonInvitees}>
+          <TouchableOpacity
+            onPress={() =>
+              this.mountvisitListOfInvitees(visitSchedule.content.visitListOfInvitees)}
+          >
+            <Text style={styles.buttonText}>PARTICIPANTES</Text>
+          </TouchableOpacity>
+        </View>
+      );
+    }
+    return participantsButton;
   }
 
-
   renderCounselorList() {
     return (
       this.state.invitees.map(counselor => (