muba-posting 9.0.17 → 9.0.19

package/Publish5.js

@@ -5,6 +5,8 @@ import commonStyles from './commonStyles';
 import InputSelect from 'muba-input-select';
 import AdFeatures from 'muba-ad-features';
 import { Views } from './utils/Views';
+import InputText from 'muba-input-text';
+import InputNumber from './shared/InputNumber.js';
 
 export default class Publish5 extends React.Component {
   constructor(props) {
@@ -75,6 +77,12 @@ export default class Publish5 extends React.Component {
         ],
         selectedItem: this.props.postingAd.landStatus
       },
+      showTerraceSurface: this.props.postingAd.terrace,
+      showGardenSurface: this.props.postingAd.garden,
+      showParkingPlaces: this.props.postingAd.garage,
+      terraceSurface: this.props.postingAd.terraceSurface,
+      gardenSurface: this.props.postingAd.gardenSurface,
+      parkingPlaces: this.props.postingAd.parkingPlaces
     }
   }
 
@@ -82,6 +90,41 @@ export default class Publish5 extends React.Component {
     this.refreshData();
   }
 
+  onChangeFeature(value, name) {
+    this.props.postingAd[name] = value
+    if (name == 'terrace') {
+      this.setState({ showTerraceSurface: value }, () => {
+        this.onChangeTerraceSurface(null);
+      });
+    } else if (name == 'garden') {
+      this.setState({ showGardenSurface: value }, () => {
+        this.onChangeGardenSurface(null);
+      })
+    } else if (name == 'garage') {
+      this.setState({ showParkingPlaces: value }, () => {
+        this.onChangeParkingPlaces(null);
+      })
+    }
+  }
+
+  onChangeTerraceSurface(text) {
+    this.setState({ terraceSurface: text }, () => {
+      this.props.postingAd.terraceSurface = text;
+    });
+  }
+
+  onChangeGardenSurface(text) {
+    this.setState({ gardenSurface: text }, () => {
+      this.props.postingAd.gardenSurface = text;
+    });
+  }
+
+  onChangeParkingPlaces(text) {
+    this.setState({ parkingPlaces: text }, () => {
+      this.props.postingAd.parkingPlaces = text;
+    });
+  }
+
   loadFeaturesOptions() {
     const labels = {}
     const options = {};
@@ -173,6 +216,18 @@ export default class Publish5 extends React.Component {
       validate = this.inputSelectOrientation.onSubmitValidate() && validate;
     }
 
+    if (this.state.showTerraceSurface) {
+      validate = this.inpuTerraceSurface.onSubmitValidate() && validate;
+    }
+
+    if (this.state.showGardenSurface) {
+      validate = this.inputGardenSurface.onSubmitValidate() && validate;
+    }
+
+    if (this.state.showParkingPlaces) {
+      validate = this.inputParkingPlaces.onSubmitValidate() && validate;
+    }
+
     return validate;
   }
 
@@ -310,13 +365,74 @@ export default class Publish5 extends React.Component {
 
                 <View style={[commonStyles.row, commonStyles.rowIcons]}>
                   {this.props.mainFeatures.map(feature =>
-                    <IconFeature
-                      key={feature.name}
+                    <IconFeature key={feature.name}
                       name={feature.name}
                       iconText={feature.label}
+                      postingAd={this.props.postingAd}
                       selected={this.props.postingAd[feature.name]}
                       disabled={!this.props.allowedToModify.features}
-                      onPress={(value) => this.props.postingAd[feature.name] = value} />
+                      onPress={(value) => this.onChangeFeature(value, feature.name)}
+                      extraField={<View>
+                        {feature.name == 'terrace' && this.state.showTerraceSurface &&
+                          <View style={[commonStyles.row, { padding: 5 }]} >
+                            <View style={commonStyles.col8}>
+                              <InputText
+                                value={this.state.terraceSurface}
+                                style={commonStyles.area}
+                                keyboardType='numeric'
+                                type='number'
+                                returnKeyType={"next"}
+                                onlyNumbers={true}
+                                required={true}
+                                maxValue={999999}
+                                onChangeText={(text) => this.onChangeTerraceSurface(text)}
+                                scroll={(ref) => this.props.scroll(ref)}
+                                ref={(element) => this.inpuTerraceSurface = element} />
+                            </View>
+                            <View style={commonStyles.col4}>
+                              <View style={[commonStyles.unit]}>
+                                <Text style={commonStyles.unitText}>{strings('setup.measureSurface')}</Text>
+                              </View>
+                            </View>
+                          </View>
+                        }
+
+                        {feature.name == 'garden' && this.state.showGardenSurface &&
+                          <View style={[commonStyles.row, { padding: 5 }]} >
+                            <View style={commonStyles.col8}>
+                              <InputText
+                                value={this.state.gardenSurface}
+                                style={commonStyles.area}
+                                keyboardType='numeric'
+                                type='number'
+                                returnKeyType={"next"}
+                                onlyNumbers={true}
+                                required={true}
+                                maxValue={999999}
+                                onChangeText={(text) => this.onChangeGardenSurface(text)}
+                                scroll={(ref) => this.props.scroll(ref)}
+                                ref={(element) => this.inputGardenSurface = element} />
+                            </View>
+                            <View style={commonStyles.col4}>
+                              <View style={[commonStyles.unit]}>
+                                <Text style={commonStyles.unitText}>{strings('setup.measureSurface')}</Text>
+                              </View>
+                            </View>
+                          </View>
+                        }
+
+                        {feature.name == 'garage' && this.state.showParkingPlaces &&
+                          <InputNumber
+                            value={this.props.postingAd.parkingPlaces || 1}
+                            minValue={1}
+                            maxValue={99}
+                            required={true}
+                            scroll={(ref) => this.props.scroll(ref)}
+                            onChange={(value) => this.onChangeParkingPlaces(value)}
+                            ref={(element) => this.inputParkingPlaces = element} />
+                        }
+                      </View>}
+                    />
                   )}
                 </View>
               </View>
@@ -336,7 +452,7 @@ export default class Publish5 extends React.Component {
                       iconText={feature.label}
                       selected={this.props.postingAd[feature.name]}
                       disabled={!this.props.allowedToModify.features}
-                      onPress={(value) => this.props.postingAd[feature.name] = value} />
+                      onPress={(value) => this.onChangeFeature(value, feature.name)} />
                   )}
                 </View>
               </View>
@@ -356,7 +472,7 @@ export default class Publish5 extends React.Component {
                       iconText={feature.label}
                       selected={this.props.postingAd[feature.name]}
                       disabled={!this.props.allowedToModify.features}
-                      onPress={(value) => this.props.postingAd[feature.name] = value} />
+                      onPress={(value) => this.onChangeFeature(value, feature.name)} />
                   )}
                 </View>
               </View>
@@ -396,12 +512,14 @@ class IconFeature extends React.Component {
 
   render() {
     return (
-      <View style={[commonStyles.characLinkBox, commonStyles.col, commonStyles.col3]}>
+      <View style={[commonStyles.characLinkBox, commonStyles.col, commonStyles.col4]}>
         <TouchableOpacity activeOpacity={1} style={[commonStyles.characIcon, this.state.selected ? commonStyles.characBoxSelected : null, this.props.disabled ? commonStyles.disabled : null]} onPress={() => this.onPressIcon()}
           disabled={this.props.disabled}>
           <AdFeatures style={[commonStyles.characImage, this.state.selected ? commonStyles.characImageSelected : null]} name={this.props.name} />
         </TouchableOpacity>
         <Text style={[commonStyles.characIconText, this.state.selected ? commonStyles.characIconTextSelected : null]}>{this.props.iconText}</Text>
+
+        {this.props.extraField}
       </View>
     );
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "muba-posting",
-  "version": "9.0.17",
+  "version": "9.0.19",
   "description": "Posting",
   "main": "Posting.js",
   "scripts": {

package/shared/InputNumber.js

@@ -59,10 +59,12 @@ export default class InputNumber extends React.Component {
       <View style={[commonStyles.col, commonStyles.col6, commonStyles.inputNumberBox]} ref={this.inputNumberView}>
         <View style={[commonStyles.col, commonStyles.col12, this.state.minValueError ? commonStyles.fieldError : null]}>
           <View style={commonStyles.inputNumberLabelBox}>
-            <View style={commonStyles.row}>
-              <Text style={commonStyles.inputNumberLabel}>{this.props.label}</Text>
-              {this.props.required ? <Text style={commonStyles.red}> *</Text> : <Text />}
-            </View>
+            {this.props.label &&
+              <View style={commonStyles.row}>
+                <Text style={commonStyles.inputNumberLabel}>{this.props.label}</Text>
+                {this.props.required ? <Text style={commonStyles.red}> *</Text> : <Text />}
+              </View>
+            }
             {this.state.minValueError ? <Text style={[commonStyles.subNote, commonStyles.red]}> {strings('setup.requiredField')}</Text> : null}
           </View>
           <View style={commonStyles.row}>