add

Strides-Admin/src/views/Reports.vue

@@ -21,7 +21,7 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="Service Provider:" v-if="reportFilter.reportType !== 'MTU' && reportFilter.reportType !== 'MSUR' && reportFilter.reportType !== 'MAF'">
+          <el-form-item label="Service Provider:" v-if="reportFilter.reportType !== 'MTU' && reportFilter.reportType !== 'MAF'">
             <el-select v-model="reportFilter.providerPk">
               <el-option
                 v-for="serviceProvider in serviceProviderOptions"
@@ -31,7 +31,7 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="Site:" v-if="reportFilter.reportType == 'MSUR' || reportFilter.reportType == 'MAF'">
+          <el-form-item label="Site:" v-if="reportFilter.reportType == 'MAF'">
             <el-select
               class="add-text"
               filterable
@@ -49,6 +49,17 @@
         </div>
 
         <div class="row">
+          <el-form-item
+            label="Year:"
+            class="row-item"
+            v-if="reportFilter.reportType != 'MAF'">
+            <el-date-picker
+              v-model="reportFilter.year"
+              format="yyyy"
+              value-format="yyyy"
+              type="year"
+              :clearable="false"/>
+          </el-form-item>
           <el-form-item
             label="Month:"
             class="row-item"
@@ -61,17 +72,6 @@
                 :key="month.value"/>
             </el-select>
           </el-form-item>
-          <el-form-item
-            label="Year:"
-            class="row-item"
-            v-if="reportFilter.reportType != 'MAF'">
-            <el-date-picker
-              v-model="reportFilter.year"
-              format="yyyy"
-              value-format="yyyy"
-              type="year"
-              :clearable="false"/>
-          </el-form-item>
           <el-form-item
             label="Date Range:"
             class="row-item"
@@ -81,7 +81,8 @@
               type="daterange"
               value-format="yyyy-MM-dd"
               start-placeholder="Start Date"
-              end-placeholder="End Date"/>
+              end-placeholder="End Date"
+              :picker-options="pickerOptions"/>
           </el-form-item>
           <el-button
             class="filter-item generate-button"
@@ -228,7 +229,18 @@ export default {
       pagination: {
         limit: 10,
         page: 1,
-      }
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: 'Nearest Week',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+            picker.$emit('pick', [start, end]);
+          }
+        }]
+      },
     }
   },
   methods: {
@@ -252,7 +264,7 @@ export default {
         if (this.dateRange.length == 2) {
           this.reportFilter.dateStart = this.dateRange[0]
           this.reportFilter.dateEnd = this.dateRange[1]
-        } else {
+        } else if (isGen) {
           this.$message({
             type: 'error',
             message: "Please select date range"
@@ -260,7 +272,7 @@ export default {
           valid = false;
         }
       }
-      if (this.reportFilter.reportType == 'MSUR' || this.reportFilter.reportType == 'MAF') {
+      if (/*this.reportFilter.reportType == 'MSUR' || */this.reportFilter.reportType == 'MAF') {
         if (!this.reportFilter.sitePk && isGen) {
           this.$message({
             type: 'error',
@@ -428,6 +440,7 @@ export default {
   }
 
   .row-item {
+    position: relative;
     margin-right: 66px;
   }
 

Strides-Admin/src/views/user/UserDetail.vue

@@ -257,7 +257,7 @@ export default {
           zipCode: '',
           street: '',
           city: '',
-          country: '',
+          country: 'SG',
           addressPk: '',
         },
         vehicleList: [],
@@ -494,6 +494,7 @@ export default {
           callingCode,
           ocppTagResponse,
           address,
+          countryCode,
           userVehicleResponses,
         } = data
         this.userModel.profile.nickName = nickName
@@ -502,21 +503,11 @@ export default {
         this.userModel.profile.phoneNumber = phone //this.getPhoneNumber(phone)
         this.userModel.profile.userPk = userPk
         this.userInfo = data;
-        const {
-          street = '',
-          zipCode = '',
-          city = '',
-          country = '',
-          addressPk = '',
-          ...otherAddress
-        } = address || {}
 
-        this.userModel.address.street = street
-        this.userModel.address.zipCode = zipCode
-        this.userModel.address.city = city
-        this.userModel.address.country = country
-        this.userModel.address.addressPk = addressPk
-        this.userModel.address.otherAddress = otherAddress
+        this.userModel.address = address || {}
+        if (!this.userModel.address.country) {
+          this.userModel.address.country = countryCode || "SG"
+        }
 
         // this.userModel.vehicleList = userVehicleResponses || []