muba-posting 8.0.4 → 8.0.6

package/EditHead.js

@@ -1,5 +1,6 @@
 import React from 'react';
-import { Text, View, ImageBackground } from 'react-native';
+import { Text, View } from 'react-native';
+import { Image } from 'expo-image';
 import commonStyles from './commonStyles';
 
 export default class EditHead extends React.Component {
@@ -44,17 +45,15 @@ export default class EditHead extends React.Component {
 
   render() {
     return (
-      <ImageBackground style={{ width: '100%' }} source={{ uri: this.state.mainPictureUrl }} resizeMode='cover'>
+      <View style={commonStyles.flex1}>
+        <Image style={{ width: '100%', height: 100 }} source={this.state.mainPictureUrl} contentFit='cover' />
         <View style={commonStyles.editBar}>
-          {this.props.postingAd.reference && this.props.postingAd.reference != '' ?
+          {this.props.postingAd.reference && this.props.postingAd.reference != '' &&
             <View style={commonStyles.editRef}>
               <Text style={[commonStyles.editRefText, commonStyles.textLeft]}>REF: {this.props.postingAd.reference}</Text>
             </View>
-            :
-            <View style={commonStyles.editRef}>
-              <Text style={[commonStyles.editRefText]}></Text>
-            </View>
           }
+
           <View style={commonStyles.editTitle}>
             <Text style={[commonStyles.editTitleText]}>
               {this.props.postingAd.languages.filter(item => this.props.postingAd.languageId === item.language) > 0
@@ -66,7 +65,7 @@ export default class EditHead extends React.Component {
             </Text>
           </View>
         </View>
-      </ImageBackground>
+      </View>
     );
   }
 }

package/Posting.js

@@ -36,6 +36,7 @@ const LOAD_PENDING_CREATED = { method: 'GET', url: '/controller/ads/pending-crea
 const PAYMENT_ONLINE_ACTIVE = { method: 'GET', url: '/controller/payments-online/{countryCode}/active' };
 const LOAD_LOCATIONS = { method: 'GET', url: '/controller/countries/{countryCode}/locations' };
 const ALLOWED_TO_MODIFY = { method: 'GET', url: '/controller/posting/allowed-to-modify' };
+const GET_FEATURES_OPTIONS = { method: 'GET', url: '/controller/posting/features-options' };
 const UPLOADED_FILES_KEY = 'uploadedFiles';
 
 export default class Posting extends React.Component {
@@ -69,6 +70,10 @@ export default class Posting extends React.Component {
       showRatePopup: false,
       originalAd: null,
       allowedToModify: {},
+      features: [],
+      mainFeatures: [],
+      insideFeatures: [],
+      otherFeatures: [],
       postingAd: {
         transaction: null,
         adType: null,
@@ -166,6 +171,10 @@ export default class Posting extends React.Component {
       {
         name: 'PostingFontAwesome',
         source: require('./fonts/Font-Awesome.ttf')
+      },
+      {
+        name: 'PostingFontAwesomeAd',
+        source: require('./fonts/Font-Awesome-ad.ttf')
       }
     ]);
     this.setState({ fontLoaded: true });
@@ -302,6 +311,18 @@ export default class Posting extends React.Component {
     }
   }
 
+  async loadFeatures() {
+    if (this.state.postingAd.adType) {
+      const responseJson = await this.props.request(this.props.context, GET_FEATURES_OPTIONS, { adTypeId: this.state.postingAd.adType });
+      this.setState({
+        features: responseJson.features,
+        mainFeatures: responseJson.mainFeatures,
+        insideFeatures: responseJson.insideFeatures,
+        otherFeatures: responseJson.otherFeatures
+      });
+    }
+  }
+
   async loadAd() {
     const bddAd = await this.getAd(this.state.adId);
     delete bddAd.phones;
@@ -365,6 +386,7 @@ export default class Posting extends React.Component {
         this.setState({ currentScreen: 2 });
         break;
       case Views.PUBLISH_3:
+        this.loadFeatures();
         this.setState({ currentScreen: 3 });
         break;
       case Views.PUBLISH_4:
@@ -594,6 +616,7 @@ export default class Posting extends React.Component {
                   showLoading={() => this._showLoading()}
                   hideLoading={() => this._hideLoading()}
                   allowedToModify={this.state.allowedToModify}
+                  features={this.state.features}
                   fullPosting={this.state.fullPosting} />
                 :
                 null
@@ -626,6 +649,10 @@ export default class Posting extends React.Component {
                   showLoading={() => this._showLoading()}
                   hideLoading={() => this._hideLoading()}
                   allowedToModify={this.state.allowedToModify}
+                  features={this.state.features}
+                  mainFeatures={this.state.mainFeatures}
+                  insideFeatures={this.state.insideFeatures}
+                  otherFeatures={this.state.otherFeatures}
                   fullPosting={this.state.fullPosting} />
                 :
                 null

package/Publish3.js

@@ -3,6 +3,7 @@ import { Text, View, TouchableHighlight } from 'react-native';
 import { strings } from 'muba-i18n';
 import commonStyles from './commonStyles';
 import RadioButtonGroup from 'muba-radio-button-group';
+import CheckBoxOption from 'muba-checkbox';
 import InputNumber from './shared/InputNumber.js';
 import InputSelect from 'muba-input-select';
 import InputText from 'muba-input-text';
@@ -26,6 +27,9 @@ export default class Publish3 extends React.Component {
 
     this.state = {
       area: this.props.postingAd.adTypeDetails.filter(function (detail) { return detail.value == "surface" }),
+      utilArea: this.props.postingAd.adTypeDetails.filter(function (detail) { return detail.value == "utilSurface" }),
+      outsideArea: this.props.postingAd.adTypeDetails.filter(function (detail) { return detail.value == "outsideSurface" }),
+      plotArea: this.props.postingAd.adTypeDetails.filter(function (detail) { return detail.value == "plotSurface" }),
       condition: this.props.postingAd.adTypeDetails.filter(function (detail) { return detail.value == "conservation" }),
       pieces: this.props.postingAd.adTypeDetails.filter(function (detail) { return detail.value == "pieces" }),
       rooms: this.props.postingAd.adTypeDetails.filter(function (detail) { return detail.value == "rooms" }),
@@ -56,9 +60,22 @@ export default class Publish3 extends React.Component {
         ],
         selectedItem: this.props.postingAd.pricePeriod
       },
+      landTypesLabel: '',
+      landTypesOptions: [],
+      constructibilityLabel: '',
+      constructibilityOptions: {
+        elements: [
+          { section: true, value: null, label: strings('setup.select') }
+        ],
+        selectedItem: this.props.postingAd.constructibility
+      },
       surface: this.props.postingAd.surface,
+      utilSurface: this.props.postingAd.utilSurface,
+      outsideSurface: this.props.postingAd.outsideSurface,
+      plotSurface: this.props.postingAd.plotSurface,
       price: this.props.postingAd.price,
       adType: this.props.postingAd.adType,
+      landTypes: this.props.postingAd.landTypes != null ? this.props.postingAd.landTypes : [],
       requiredErrorCondition: false,
       priceError: null
     };
@@ -77,15 +94,44 @@ export default class Publish3 extends React.Component {
     }
 
     this.setState({ priceOptions: priceOptions });
+    this.loadFeaturesOptions();
     this.refreshData();
   }
 
+  async loadFeaturesOptions() {
+    const labels = {}
+    const options = {};
+    this.props.features.forEach(feature => {
+      if (feature.name === 'landTypes') {
+        options[feature.name + 'Options'] = [];
+        feature.options.map((item) => {
+          options[feature.name + 'Options'].push(item);
+        });
+      } else if (this.state[feature.name + 'Options']) {
+        options[feature.name + 'Options'] = { ...this.state[feature.name + 'Options'], elements: [...this.state[feature.name + 'Options'].elements] };
+        options[feature.name + 'Options'].elements[0].label = feature.label;
+        feature.options.map((item) => {
+          options[feature.name + 'Options'].elements.push(item);
+        });
+      }
+      labels[feature.name + 'Label'] = feature.label;
+    });
+
+    this.setState({
+      ...labels,
+      ...options
+    });
+  }
+
   async refreshData() {
     if (this.state.adType != this.props.postingAd.adType) {
       const pricePeriod = this.props.postingAd.adTypeDetails.filter(function (detail) { return detail.value == "pricePeriod" });
 
       await this.setState({
         area: this.props.postingAd.adTypeDetails.filter(function (detail) { return detail.value == "surface" }),
+        utilArea: this.props.postingAd.adTypeDetails.filter(function (detail) { return detail.value == "utilSurface" }),
+        outsideArea: this.props.postingAd.adTypeDetails.filter(function (detail) { return detail.value == "outsideSurface" }),
+        plotArea: this.props.postingAd.adTypeDetails.filter(function (detail) { return detail.value == "plotSurface" }),
         condition: this.props.postingAd.adTypeDetails.filter(function (detail) { return detail.value == "conservation" }),
         pieces: this.props.postingAd.adTypeDetails.filter(function (detail) { return detail.value == "pieces" }),
         rooms: this.props.postingAd.adTypeDetails.filter(function (detail) { return detail.value == "rooms" }),
@@ -188,6 +234,20 @@ export default class Publish3 extends React.Component {
     return validate;
   }
 
+  changeLandType = async (newLandType) => {
+    let currentLandTypes = Array.from(this.state.landTypes);
+    if (currentLandTypes.includes(newLandType)) {
+      currentLandTypes = currentLandTypes.filter(landType => newLandType !== landType);
+    } else {
+      currentLandTypes.push(newLandType);
+    }
+
+    this.props.postingAd.landTypes = currentLandTypes;
+    this.setState({
+      landTypes: currentLandTypes
+    });
+  }
+
   onChangeCondition(value) {
     this.props.postingAd.condition = value;
   }
@@ -197,6 +257,21 @@ export default class Publish3 extends React.Component {
     this.setState({ surface: text });
   }
 
+  onChangeUtilArea(text) {
+    this.props.postingAd.utilSurface = text;
+    this.setState({ utilSurface: text });
+  }
+
+  onChangeOutsideArea(text) {
+    this.props.postingAd.outsideSurface = text;
+    this.setState({ outsideSurface: text });
+  }
+
+  onChangePlotArea(text) {
+    this.props.postingAd.plotSurface = text;
+    this.setState({ plotSurface: text });
+  }
+
   onChangePrice(text) {
     this.props.postingAd.price = text;
     this.setState({ price: text });
@@ -239,6 +314,96 @@ export default class Publish3 extends React.Component {
               null
             }
 
+            {this.state.utilArea.length > 0 ?
+              <View style={commonStyles.row} >
+                <View style={commonStyles.col8}>
+                  <InputText value={this.state.utilSurface}
+                    textContainerStyle={commonStyles.inputContainer}
+                    style={commonStyles.area}
+                    label={this.state.utilArea[0].label}
+                    labelStyle={commonStyles.progressbarField}
+                    keyboardType='numeric'
+                    type='number'
+                    returnKeyType={"next"}
+                    onlyNumbers={true}
+                    required={false}
+                    maxValue={999999}
+                    disabled={!this.props.allowedToModify.utilSurface}
+                    onChangeText={(text) => this.onChangeUtilArea(text)}
+                    onSubmitEditing={(event) => { this.inputTextPrice.focus(); }}
+                    scroll={(ref) => this.props.scroll(ref)}
+                    ref={(element) => this.inputTextUtilArea = element} />
+                </View>
+                <View style={commonStyles.col4}>
+                  <View style={[commonStyles.unit]}>
+                    <Text style={commonStyles.unitText}>{strings('setup.measureSurface')}</Text>
+                  </View>
+                </View>
+              </View>
+              :
+              null
+            }
+
+            {this.state.outsideArea.length > 0 ?
+              <View style={commonStyles.row} >
+                <View style={commonStyles.col8}>
+                  <InputText value={this.state.outsideSurface}
+                    textContainerStyle={commonStyles.inputContainer}
+                    style={commonStyles.area}
+                    label={this.state.outsideArea[0].label}
+                    labelStyle={commonStyles.progressbarField}
+                    keyboardType='numeric'
+                    type='number'
+                    returnKeyType={"next"}
+                    onlyNumbers={true}
+                    required={false}
+                    maxValue={999999}
+                    disabled={!this.props.allowedToModify.outsideSurface}
+                    onChangeText={(text) => this.onChangeOutsideArea(text)}
+                    onSubmitEditing={(event) => { this.inputTextPrice.focus(); }}
+                    scroll={(ref) => this.props.scroll(ref)}
+                    ref={(element) => this.inputTextOutsideArea = element} />
+                </View>
+                <View style={commonStyles.col4}>
+                  <View style={[commonStyles.unit]}>
+                    <Text style={commonStyles.unitText}>{strings('setup.measureSurface')}</Text>
+                  </View>
+                </View>
+              </View>
+              :
+              null
+            }
+
+            {this.state.plotArea.length > 0 ?
+              <View style={commonStyles.row} >
+                <View style={commonStyles.col8}>
+                  <InputText value={this.state.plotSurface}
+                    textContainerStyle={commonStyles.inputContainer}
+                    style={commonStyles.area}
+                    label={this.state.plotArea[0].label}
+                    labelStyle={commonStyles.progressbarField}
+                    keyboardType='numeric'
+                    type='number'
+                    returnKeyType={"next"}
+                    onlyNumbers={true}
+                    required={false}
+                    maxValue={999999}
+                    disabled={!this.props.allowedToModify.plotSurface}
+                    onChangeText={(text) => this.onChangePlotArea(text)}
+                    onSubmitEditing={(event) => { this.inputTextPrice.focus(); }}
+                    scroll={(ref) => this.props.scroll(ref)}
+                    ref={(element) => this.inputTextPlotArea = element} />
+                </View>
+                <View style={commonStyles.col4}>
+                  <View style={[commonStyles.unit]}>
+                    <Text style={commonStyles.unitText}>{strings('setup.measureSurface')}</Text>
+                  </View>
+                </View>
+              </View>
+              :
+              null
+            }
+
             <View style={commonStyles.row} >
               <View style={this.state.pricePeriod.length > 0 ? [commonStyles.col, commonStyles.col4] : [commonStyles.col, commonStyles.col8]}>
                 <InputText value={this.state.price}
@@ -299,6 +464,41 @@ export default class Publish3 extends React.Component {
               null
             }
 
+            {this.state.landTypesOptions.length > 0 ?
+              <View>
+                <View style={commonStyles.minDivider} />
+                <View style={[commonStyles.row, commonStyles.inputNumberLabelBox]}>
+                  <Text style={commonStyles.inputNumberLabel}>{this.state.landTypesLabel}</Text>
+                  {this.props.required ? <Text style={commonStyles.red}> *</Text> : null}
+                  {this.state.requiredError ? <Text style={[commonStyles.subNote, commonStyles.red]}> {strings('setup.requiredField')}</Text> : null}
+                </View>
+                {this.state.landTypesOptions.map((landType, index) =>
+                  <View key={index + '_0'}>
+                    <CheckBoxOption
+                      disabled={!this.props.allowedToModify.landTypes}
+                      onChange={() => this.changeLandType(landType.value)}
+                      checked={this.state.landTypes.includes(landType.value)}
+                      label={landType.label} />
+                  </View>
+                )}
+              </View>
+              : null}
+
+            {this.state.constructibilityOptions.elements.length > 1 ?
+              <InputSelect
+                options={this.state.constructibilityOptions}
+                placeholder={strings('setup.select')}
+                required={false}
+                scroll={(ref) => this.props.scroll(ref)}
+                label={this.state.constructibilityLabel}
+                labelStyle={commonStyles.progressbarField}
+                selectStyle={commonStyles.inputSelect}
+                disabled={!this.props.allowedToModify.constructibility}
+                onChange={(value) => this.props.postingAd.constructibility = value}
+                ref={(element) => this.inputSelectConstructibility = element} />
+              :
+              null}
+
             <View style={[commonStyles.progressbarFieldContainer, commonStyles.row, commonStyles.col12, { flexWrap: 'wrap' }]}>
               {this.state.pieces.length > 0 ?
                 <InputNumber