Merge branch 'release/v3.7.10'

Se agrega el componente para entregar insumos por autoridad catastral Se agrega componente para desasignar gestores a municipios Se agregan nuevas vistas Se agrega funcionalidad para eliminar información de entrega Cambios de nombres y textos Se implementa funcionalidad para recuperar contraseña o usuario Se cambia el componente para asignación de un único gestor a un municipio por múltiples gestores. Se cambian servicios para autoridad catastral, gestores, proveedores y operadores Se ordenan listas y selectores por orden alfabético Se implementa interfaz para agregar múltiples operadores Se cambia la interfaz de información básica por múltiples gestores y edición de la información básica para cada gestor Se implementa funcionalidad para omitir la validación geográfica al momento de subir insumos y se generan advertencias al respecto Se implementan logs dentro de las vistas de cargue de insumos e integración se actualiza la vista para actualizar la información de un usuario Implementación de directivas dentro de campos de asignación de operador
SwissTierrasColombia · Apr 20, 2021 · 8bd7db3 · 8bd7db3
2 parents 7f34512 + 6179fb6
commit 8bd7db3
Show file tree

Hide file tree

Showing 72 changed files with 7,221 additions and 4,692 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "st-site-web",
-  "version": "2.9.15",
+  "version": "3.7.10",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
@@ -12,66 +12,66 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^10.0.3",
-    "@angular/cdk": "^10.0.1",
-    "@angular/common": "~10.0.3",
-    "@angular/compiler": "~10.0.3",
-    "@angular/core": "~10.0.3",
-    "@angular/forms": "~10.0.3",
-    "@angular/localize": "^10.0.3",
-    "@angular/material": "^10.0.1",
-    "@angular/platform-browser": "~10.0.3",
-    "@angular/platform-browser-dynamic": "~10.0.3",
-    "@angular/router": "~10.0.3",
+    "@angular/animations": "^10.2.4",
+    "@angular/cdk": "^10.2.7",
+    "@angular/common": "^10.0.14",
+    "@angular/compiler": "^10.0.14",
+    "@angular/core": "^10.0.14",
+    "@angular/forms": "^10.0.14",
+    "@angular/localize": "^10.2.4",
+    "@angular/material": "^10.2.7",
+    "@angular/platform-browser": "^10.0.14",
+    "@angular/platform-browser-dynamic": "^10.0.14",
+    "@angular/router": "^10.0.14",
     "@auth0/angular-jwt": "^3.0.1",
     "@fortawesome/angular-fontawesome": "^0.5.0",
-    "@fortawesome/fontawesome-svg-core": "^1.2.25",
-    "@fortawesome/free-solid-svg-icons": "^5.11.2",
-    "@ng-bootstrap/ng-bootstrap": "^5.2.1",
-    "@types/file-saver": "^2.0.1",
+    "@fortawesome/fontawesome-svg-core": "^1.2.35",
+    "@fortawesome/free-solid-svg-icons": "^5.15.3",
+    "@ng-bootstrap/ng-bootstrap": "^5.3.1",
+    "@types/file-saver": "^2.0.2",
     "angular-animations": "0.0.10",
     "chart.js": "2.7.3",
     "core-js": "2.5.7",
-    "file-saver": "^2.0.2",
+    "file-saver": "^2.0.5",
     "font-awesome": "4.7.0",
-    "jquery": "^3.5.1",
-    "moment": "^2.24.0",
-    "ng-select2": "^1.2.2",
+    "jquery": "^3.6.0",
+    "moment": "^2.29.1",
+    "ng-select2": "^1.2.5",
     "ng2-charts": "2.3.0",
     "ng2-search-filter": "^0.5.1",
-    "ng2-tooltip-directive": "^2.8.17",
+    "ng2-tooltip-directive": "^2.9.22",
     "ngx-moment": "^3.5.0",
     "ngx-pagination": "^4.1.0",
     "ngx-spinner": "^8.0.3",
     "ngx-toastr": "^11.2.1",
     "normalize.css": "^8.0.1",
-    "ol": "^6.3.1",
-    "proj4": "^2.6.2",
-    "rxjs": "~6.6.0",
+    "ol": "^6.5.0",
+    "proj4": "^2.7.2",
+    "rxjs": "^6.6.7",
     "select2": "^4.0.13",
-    "tslib": "^2.0.0",
+    "tslib": "^2.2.0",
     "yarn": "1.22.0",
     "zone.js": "~0.10.3"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^0.1000.1",
-    "@angular/cli": "~10.0.1",
-    "@angular/compiler-cli": "~10.0.3",
-    "@angular/language-service": "~10.0.3",
-    "@types/jasmine": "~3.5.0",
+    "@angular-devkit/build-angular": "^0.1000.8",
+    "@angular/cli": "^10.0.8",
+    "@angular/compiler-cli": "^10.0.14",
+    "@angular/language-service": "^10.0.14",
+    "@types/jasmine": "^3.5.14",
     "@types/jasminewd2": "~2.0.3",
-    "@types/node": "^12.11.1",
+    "@types/node": "^12.20.7",
     "codelyzer": "^5.1.2",
     "jasmine-core": "~3.5.0",
     "jasmine-spec-reporter": "~5.0.0",
     "karma": "~5.0.0",
     "karma-chrome-launcher": "~3.1.0",
     "karma-coverage-istanbul-reporter": "~3.0.2",
     "karma-jasmine": "~3.3.0",
-    "karma-jasmine-html-reporter": "^1.5.0",
+    "karma-jasmine-html-reporter": "^1.5.4",
     "protractor": "~7.0.0",
     "ts-node": "~8.3.0",
-    "tslint": "~6.1.0",
-    "typescript": "~3.9.6"
+    "tslint": "^6.1.3",
+    "typescript": "^3.9.9"
   }
 }
diff --git a/src/app/layout/components/sidebar/sidebar.component.html b/src/app/layout/components/sidebar/sidebar.component.html
@@ -38,12 +38,33 @@
               href=""
               [routerLink]="['/gestion/workspace/active']"
               (click)="isCollapsed(listMenu.gestion)"
+            >
+              <i class="fa fa-fw fa-angle-double-right"></i>&nbsp;
+              <span>Búsqueda de</span><br />
+              <span class="ml-4">municipios</span>
+            </a>
+          </li>
+          <li *ngIf="roleAdmin ? roleAdmin.id : 0 === allroles.administrador">
+            <a
+              href=""
+              [routerLink]="['/gestion/workspace/delivery']"
+              (click)="isCollapsed(listMenu.gestion)"
             >
               <i class="fa fa-fw fa-angle-double-right"></i>&nbsp;
               <span>Entrega de</span><br />
               <span class="ml-4">información</span>
             </a>
           </li>
+          <li *ngIf="roleAdmin ? roleAdmin.id : 0 === allroles.administrador">
+            <a
+              href=""
+              [routerLink]="['/gestion/workspace/refuse']"
+              (click)="isCollapsed(listMenu.gestion)"
+            >
+              <i class="fa fa-fw fa-angle-double-right"></i>&nbsp;
+              <span>Desasignar</span>
+            </a>
+          </li>
           <li *ngIf="rolegestor ? rolegestor.id : 0 === allroles.gestor">
             <a
               href=""
@@ -232,15 +253,15 @@
         <ul class="submenu">
           <li>
             <a
-              [routerLink]="['/administrador/usuarios']"
+              [routerLink]="['/administrador/usuarios/1']"
               (click)="isCollapsed(listMenu.administrador)"
             >
               <i class="fa fa-fw fa-angle-double-right"></i>
               <span>Listar</span><br />
               <span class="ml-3">Usuarios</span>
             </a>
           </li>
-          <li>
+          <li *ngIf="!this.user.is_manager_director">
             <a
               [routerLink]="['/administrador/crear-usuario']"
               (click)="isCollapsed(listMenu.administrador)"

diff --git a/src/app/layout/sections/administrator/administrador-routing.module.ts b/src/app/layout/sections/administrator/administrador-routing.module.ts
@@ -16,11 +16,11 @@ const routes: Routes = [
     component: CreateUserComponent,
   },
   {
-    path: 'usuarios',
+    path: 'usuarios/:tab',
     component: ListUserComponent,
   },
   {
-    path: 'usuario/:idUser/modificar',
+    path: 'usuario/:idUser/modificar/:tab',
     component: UpdateUserComponent,
   },
   {

diff --git a/src/app/layout/sections/administrator/create-user/create-user.component.html b/src/app/layout/sections/administrator/create-user/create-user.component.html
@@ -223,7 +223,7 @@ <h3 class="text-center mb-2" *ngIf="roleConnect.id === 4">
                     <!-- <small id="entities" class="form-text text-muted">Seleccione el perfil del gestor</small> -->
                   </div>
                   <div class="mb-3" *ngIf="selectROL === 3">
-                    <!-- Proveedor lista unica -->
+                    <!-- Operador lista unica -->
                     <div class="input-group">
                       <div class="input-group-prepend">
                         <label class="input-group-text" aria-required="true"