@kigi/components 1.23.0-release → 1.24.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kigi/components",
-  "version": "1.23.0-release",
+  "version": "1.24.0-beta.2",
   "description": "@kigi/components",
   "main": "src/components/index.ts",
   "scripts": {
@@ -97,4 +97,4 @@
     "webpack": "^2.5.1",
     "webpack-dev-server": "^2.6.1"
   }
-}
+}

package/src/components/mbg-address/mbg-address.ts

@@ -342,40 +342,59 @@ class MbgAddressController {
 
   async searchAddressByCEP() {
     if (this.address && this.address.zipCode) {
-      this.mbgAddressService.getCep(this.address.zipCode).then((response) => {
-        if (response && response.data && response.data.cep) {
-          const uf = getStatesBR().filter((state) => state.initial === response.data.uf)[0]
-          const formalCode = response.data.ibge || ''
-          const premisse = this.formatFromPremisse(response.data.logradouro)
-          this.address = {
-            zipCode: this.address.zipCode.replace('-', ''),
-            neighbourhood: response.data.bairro ? response.data.bairro.trim() : 'Centro',
-            localization: this.address.localization
-              ? this.address.localization
-              : (response.data.localidade || '').trim(),
-            premisse: premisse || 'CEP Único',
-            number: this.address.number || '',
-            information: this.address.information || '',
-            premisseSteps: this.address.premisseSteps || '',
-            premisseType: this.getPremisseType(premisse),
-            stateCode: formalCode.substring(0, 2),
-            formalCode,
-            uf,
-          }
-          if (!premisse) {
-            if (this.notFoundPremisse) {
-              this.notFoundPremisse()
-            }
-            this.openModalManual(false, this.address)
-            return
+      const response = await this.mbgAddressService.getCep(this.address.zipCode);
+
+      if (response && response.data && response.data.cep) {
+        let street, neighborhood, city, state, ibgeCode = '';
+
+        if (response.key == 'viacep') {
+          street = response.data.logradouro;
+          neighborhood = response.data.bairro;
+          city = response.data.localization;
+          state = response.data.uf;
+          ibgeCode = response.data.ibge;
+        } else if (response.key == 'brasilApi') {
+          street = response.data.street;
+          neighborhood = response.data.neighborhood;
+          city = response.data.city;
+          state = response.data.state;
+          const responseIbge = await this.mbgAddressService.getIbgeCode(response.data.city)
+          ibgeCode = (responseIbge && responseIbge.data) && responseIbge.data.id.toString();
+        }
+
+        const uf = getStatesBR().filter((state) => state.initial === response.data.uf)[0]
+        const formalCode = ibgeCode || ''
+        const premisse = this.formatFromPremisse(street)
+
+        this.address = {
+          zipCode: this.address.zipCode.replace('-', ''),
+          neighbourhood: neighborhood ? neighborhood.trim() : 'Centro',
+          localization: city
+            ? city
+            : (response.data.localidade || '').trim(),
+          premisse: premisse || 'CEP Único',
+          number: this.address.number || '',
+          information: this.address.information || '',
+          premisseSteps: this.address.premisseSteps || '',
+          premisseType: this.getPremisseType(premisse),
+          stateCode: formalCode.substring(0, 2),
+          formalCode,
+          uf,
+        }
+
+        if (!premisse) {
+          if (this.notFoundPremisse) {
+            this.notFoundPremisse()
           }
-          this.updateSteps()
-          this.createFullName()
-          this.$timeout(() => this.focusInputNumber())
-        } else {
-          this.notFound()
+          this.openModalManual(false, this.address)
+          return
         }
-      })
+        this.updateSteps()
+        this.createFullName()
+        this.$timeout(() => this.focusInputNumber())
+      } else {
+        this.notFound()
+      }
     }
   }
 

package/src/components/mbg-address/services/mbg-address.service.ts

@@ -2,6 +2,9 @@ class MbgAddressService {
   private apiLocation = 'https://anothers.kigisistemas.com.br/services-api'
   private googleKey = 'AIzaSyAATuKM3qZOaw0oArk_zNUJMOtGfwhoUEI'
   private googleAPI = 'https://maps.google.com/maps/api/geocode/json'
+  private viaCepAPI = 'https://viacep.com.br/ws'
+  private brasilAPI = 'https://brasilapi.com.br/api'
+  private ibgeGovAPI = 'https://servicodados.ibge.gov.br/api/v1/localidades/municipios'
 
   constructor(public $http) {}
 
@@ -21,9 +24,26 @@ class MbgAddressService {
     return this.$http.get(`${this.googleAPI}?address=${address}&key=${this.googleKey}`)
   }
 
-  getCep(cep: string) {
-    // return this.$http.get(`${this.apiLocation}/public/busca-cep/${cep}`)
-    return this.$http.get(`https://viacep.com.br/ws/${cep}/json/`)
+  async getCep(zipCode: string) {
+    try {
+      return await this.$http.get(`${this.viaCepAPI}/${zipCode}/json/`).then(res => {
+        res.key = 'viacep';
+        return res;
+      })
+    } catch (error) {
+      return await this.$http.get(`${this.brasilAPI}/cep/v1/${zipCode}`).then(res => {
+        res.key = 'brasilApi';
+        return res;
+      })
+    }
+  }
+
+  async getIbgeCode(municipio: string) {
+    try {
+      return await this.$http.get(`${this.ibgeGovAPI}/${municipio}`)
+    } catch (e) {
+      console.log(`Erro ao obter código do IBGE`)
+    }
   }
 
   getAddress(uf, city, premisse, neighbourhood) {

package/src/components/mbg-dropdown/mbg-dropdown.scss

@@ -27,7 +27,8 @@
         align-items: center;
         color: var(--neutral2);
         padding: 6px 20px;
-
+        width: 100%;
+        
         i {
             color: var(--neutral2);
             margin-right: 10px;

package/src/components/mbg-dropdown/mbg-dropdown.ts

@@ -76,7 +76,7 @@ class MbgDropdownController {
   }
 }
 
-MbgDropdownController.$inject = ['$scope', '$element', '$attrs', '$timeout']
+MbgDropdownController['.$inject'] = ['$scope', '$element', '$attrs', '$timeout']
 
 const mbgDropdown = {
   bindings: {

package/src/components/mbg-homescreen/cards/typeone/typeone.ts

@@ -1,6 +1,5 @@
 import './typeone.scss'
 import template from './typeone.html'
-import { isArray } from '@uirouter/angularjs'
 
 class MbgCardTypeOneController {
   public hideValue: boolean
@@ -28,7 +27,7 @@ class MbgCardTypeOneController {
     this.card.setNewValue = (value) => {
       this.setValue(value)
     }
-    if (this.card.items && this.card.items.length > 0 && !isArray(this.card.items[0])) {
+    if (this.card.items && this.card.items.length > 0 && !Array.isArray(this.card.items[0])) {
       this.card.items = [this.card.items]
     }
   }

package/src/components/mbg-list/mbg-list.ts

@@ -25,7 +25,7 @@ export class MbgListController {
   public dinamic
   public dinamicColumns
 
-  constructor(public $scope, public $element, public $attrs, public $timeout, public $transclude) {}
+  constructor(public $scope, public $element, public $attrs, public $timeout, public $transclude) { }
 
   $onInit() {
     this.enableOnSelectByRow =
@@ -264,7 +264,7 @@ export class MbgListController {
           )
         }) %
           2 ===
-        0
+          0
           ? '#eaeaea'
           : '#F5F5F5',
     }

package/src/components/mbg-select/mbg-select.ts

@@ -1,4 +1,4 @@
-import { Capitalize } from '@kigi/components/src/helpers/capitalize'
+import { Capitalize } from '../../helpers/capitalize'
 import * as angular from 'angular'
 import './mbg-select.scss'
 import template from './mbg-select.html'

package/src/components/mbg-select-multi-list/mbg-select-multi-list.html

@@ -23,12 +23,16 @@
             </mbg-input-search>
             <div ng-if="$ctrl.listHeaderDataTransclude"
                  mbg-dynamic-html="$ctrl.listHeaderDataTransclude"></div>
-            <div class="mbg-multi-list-wrapper"
-                 ng-show="$ctrl.data.length > 0">
+            <div class="mbg-multi-list-wrapper">
                 <div ng-if="$ctrl.listRowTransclude"
                      ng-click="$ctrl.selectRow($row)"
                      ng-repeat="$row in $ctrl.data track by $index"
-                     mbg-dynamic-html="$ctrl.listRowTransclude"></div>
+                     mbg-dynamic-html="$ctrl.listRowTransclude">
+                </div>
+                <div ng-show="!$ctrl.data.length"
+                     class="not-data">
+                    <span>Todos os cheques dessa página já foram selecionados.</span>
+                </div>
                 <div class="row-content"
                      ng-click="$ctrl.selectRow($row)"
                      ng-if="!$ctrl.listRowTransclude && $ctrl.label"
@@ -40,8 +44,7 @@
                  ng-show="$ctrl.count">
                 <span>{{$ctrl.data.length}} / {{$ctrl.count}}</span>
             </div>
-            <div class="row m-b-24 m-t-14"
-                 ng-show="$ctrl.pagination.data.length > 0">
+            <div class="row m-b-24 m-t-14">
                 <div class="col-md-12">
                     <mbg-pagination active-page="$ctrl.pagination.page"
                                     page-size="$ctrl.pagination.pageSize"

package/src/components/mbg-select-multi-list/mbg-select-multi-list.scss

@@ -1,11 +1,11 @@
 .mbg-select-multi-list-wrapper {
-  .message-text{
+  .message-text {
     display: flex;
     justify-content: center;
     align-items: center;
     padding-top: 102px;
-    margin-bottom: 152px;  
-}
+    margin-bottom: 152px;
+  }
 
   mbg-input-search .mbg-input-search-wrapper .input-group-search {
     border: none;
@@ -17,11 +17,19 @@
 
   .mbg-multi-list-wrapper {
     max-height: 280px;
+    height: 280px;
     overflow: auto;
     padding: 14px 14px 6px 14px;
     background-color: #f5f5f5;
   }
-
+  .not-data {
+    display: flex;
+    width: 100%;
+    overflow: hidden;
+    height: 260px;
+    justify-content: center;
+    align-items: center;
+  }
   .row-content {
     align-items: center;
     border-radius: 5px;
@@ -35,7 +43,7 @@
     cursor: pointer;
 
     &:hover {
-        opacity: 0.7;
+      opacity: 0.7;
     }
   }
 

package/src/components/mbg-text-area/mbg-text-area.html

@@ -1,6 +1,7 @@
-<div class="mbg-text-wrapper mb-text-area-wrapper">
+<div class="mbg-text-wrapper mbg-text-area-wrapper">
     <textarea type="text"
               ng-model="$ctrl.ngModel"
+              ng-class="{'max-height': $ctrl.maxHeight}"
               ng-change="$ctrl.onChange()"
               ng-required="$ctrl.ngRequired"
               ng-disabled="$ctrl.ngDisabled"

package/src/components/mbg-text-area/mbg-text-area.scss

@@ -1,3 +1,9 @@
-// .mbg-text-area-wrapper {
-   
-// }
+.mbg-text-wrapper {
+  
+   .max-height{
+      min-height: 42px;
+      max-height: 65px;
+      height: 42px;
+      padding: 11px;
+   }
+}

package/src/components/mbg-text-area/mbg-text-area.ts

@@ -22,7 +22,7 @@ class MbgTextAreaController {
     }
   }
 }
-MbgTextAreaController.$inject = ['$scope', '$element', '$attrs']
+MbgTextAreaController['$inject'] = ['$scope', '$element', '$attrs']
 
 const mbgTextArea = {
   bindings: {
@@ -37,6 +37,7 @@ const mbgTextArea = {
     ngKeydown: '&?',
     placeholder: '@?',
     maxLength: '@?',
+    maxHeight: '=?'
   },
   template,
   controller: MbgTextAreaController,

package/src/index.html

@@ -156,6 +156,8 @@
 </head>
 
 <body ng-controller="demoCtrl">
+  <mbg-address ng-model="address"></mbg-address>
+        <pre>{{ address | json }}</pre>
   <!-- <div style="padding: 100px;">
     <div class="row">
       <div class="col-md-12">  -->
@@ -1002,10 +1004,10 @@
       </div>
     </div> -->
 
-    <div>
+    <!-- <div>
       <mbg-image-upload-crop ng-model="imgCrop"
                              config="configImgCrop"></mbg-image-upload-crop>
-    </div>
+    </div> -->
 
 
   </div>