From 077ebab33eba2d0059662fe2e8d0af61f534a706 Mon Sep 17 00:00:00 2001 From: MauricioAcosta Date: Fri, 22 Jan 2021 15:42:34 -0500 Subject: [PATCH 01/54] add component by delivery supplies by Cadastral authorization --- .../supplies-delivery.component.html | 384 ++++++++++++++++++ .../supplies-delivery.component.scss | 0 .../supplies-delivery.component.spec.ts | 25 ++ .../supplies-delivery.component.ts | 268 ++++++++++++ 4 files changed, 677 insertions(+) create mode 100644 src/app/layout/sections/municipality-management/supplies-delivery/supplies-delivery.component.html create mode 100644 src/app/layout/sections/municipality-management/supplies-delivery/supplies-delivery.component.scss create mode 100644 src/app/layout/sections/municipality-management/supplies-delivery/supplies-delivery.component.spec.ts create mode 100644 src/app/layout/sections/municipality-management/supplies-delivery/supplies-delivery.component.ts diff --git a/src/app/layout/sections/municipality-management/supplies-delivery/supplies-delivery.component.html b/src/app/layout/sections/municipality-management/supplies-delivery/supplies-delivery.component.html new file mode 100644 index 00000000..81d5e560 --- /dev/null +++ b/src/app/layout/sections/municipality-management/supplies-delivery/supplies-delivery.component.html @@ -0,0 +1,384 @@ +
+ + +
+
+

Entrega de insumos - Habilitación Catastral

+
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+
+
+
+
+ +
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+ Autoridad Catastral, cargue aquí la información que requiere + entregar al Gestor para iniciar la Gestión Catastral del municipio. +
+ +
+
+
+
+ +
+ +
+
+
+
+
+
+ +
+ Cargue el archivo con la información a entregar. +
+
+
+ +
+
+
+
+
Credenciales
+
+ +
+
+
+
+
+ +
+ Cargue la evidencia de la entrega fisica de la + información. +
+
+
+
+
+
+
+
* Nombre
+
+ +
+
+
+
+
+
+ * Observaciones
+ (max. 255 caracteres) +
+
+ +
+
+
+ +
+
+
+ +
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + +
#Entregado porNombreFecha de cargueObservaciónEliminar
{{ index + 1 }}AUTORIDAD CATASTRAL{{ item.name }}{{ formatDate(item.createdAt) }} + + + + delete_forever + + +
+

+ ¿Está seguro de eliminar el registro? +

+ +
+
+
+ Advertencia: La información se borrará permanentemente del + Sistema. +
+
+
+
+ +
+
+ +
+
+ +
+
+
+
+
+ +
+
+
+
+ +
+
+
+ +
+

+ ¿Está seguro de realizar esta entrega al Gestor? +

+ +
+
+
+ Advertencia: Esta acción realizará una entrega de información al Gestor. +
+
+
+
+ +
+
+ +
+
+ +
diff --git a/src/app/layout/sections/municipality-management/supplies-delivery/supplies-delivery.component.scss b/src/app/layout/sections/municipality-management/supplies-delivery/supplies-delivery.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/src/app/layout/sections/municipality-management/supplies-delivery/supplies-delivery.component.spec.ts b/src/app/layout/sections/municipality-management/supplies-delivery/supplies-delivery.component.spec.ts new file mode 100644 index 00000000..1abcb5d3 --- /dev/null +++ b/src/app/layout/sections/municipality-management/supplies-delivery/supplies-delivery.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { SuppliesDeliveryComponent } from './supplies-delivery.component'; + +describe('SuppliesDeliveryComponent', () => { + let component: SuppliesDeliveryComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ SuppliesDeliveryComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(SuppliesDeliveryComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/layout/sections/municipality-management/supplies-delivery/supplies-delivery.component.ts b/src/app/layout/sections/municipality-management/supplies-delivery/supplies-delivery.component.ts new file mode 100644 index 00000000..3bff7b13 --- /dev/null +++ b/src/app/layout/sections/municipality-management/supplies-delivery/supplies-delivery.component.ts @@ -0,0 +1,268 @@ +import { Component, OnInit } from '@angular/core'; +import { ToastrService } from 'ngx-toastr'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { environment } from 'src/environments/environment'; +import { WorkspacesService } from 'src/app/services/workspaces/workspaces.service'; +import { SuppliesService } from 'src/app/services/supplies/supplies.service'; +import * as _moment from 'moment'; +import { ManagersService } from 'src/app/services/managers/managers.service'; +import { JwtHelper } from 'src/app/helpers/jwt'; +import { RoleModel } from 'src/app/helpers/role.model'; + +const moment = _moment; + +@Component({ + selector: 'app-supplies-delivery', + templateUrl: './supplies-delivery.component.html', + styleUrls: ['./supplies-delivery.component.scss'], +}) +export class SuppliesDeliveryComponent implements OnInit { + selectAttachments: number; + ftpAttachmentsTypes: string; + fileAttachmentsTypes: any; + validInputAttachmentsTypes: boolean; + observationsAttachmentsTypes: string; + nameAttachmentsTypes: string; + passftpAttachments: string; + selectMunicipality: number; + suppliesAttachmentsData: any; + dataAttachmentsTypes: any; + idSupplieDelete: number; + idWorkspace: number; + isSearch: boolean; + activeManagers: any; + isAdministrator: boolean; + selectManager: number; + munucipalities: any; + isActive: boolean; + isActiveSearch: boolean; + constructor( + private modalService: NgbModal, + private toastr: ToastrService, + private serviceWorkspaces: WorkspacesService, + private insumosService: SuppliesService, + private serviceManagers: ManagersService, + private roles: RoleModel + ) { + this.selectAttachments = 0; + this.ftpAttachmentsTypes = ''; + this.validInputAttachmentsTypes = false; + this.observationsAttachmentsTypes = ''; + this.nameAttachmentsTypes = ''; + this.passftpAttachments = ''; + this.selectMunicipality = 0; + this.suppliesAttachmentsData = []; + this.dataAttachmentsTypes = []; + this.idWorkspace = 0; + this.isSearch = false; + this.activeManagers = []; + this.selectManager = 0; + this.munucipalities = 0; + this.isAdministrator = false; + this.isActiveSearch = false; + } + + ngOnInit(): void { + this.serviceManagers.getManagers().subscribe((data: any) => { + this.activeManagers = data; + }); + const rol = JwtHelper.getUserPublicInformation(); + const role = rol.roles.find((elem) => { + return elem.id === this.roles.administrador; + }); + this.isAdministrator = false; + if (role) { + this.isAdministrator = true; + } + } + + changeDepartament() { + this.serviceWorkspaces + .getMunicipalitiesByManager(this.selectManager) + .subscribe((data) => { + this.munucipalities = data; + }); + } + searchWorkSpaceActive() { + this.serviceWorkspaces + .getWorkSpaceByMunicipality(this.selectMunicipality.toString()) + .subscribe((response: any) => { + if (response.length > 0) { + this.isActive = true; + this.idWorkspace = response[0].id; + console.log('getWorkSpaceByMunicipality: ', response); + + this.search(); + this.isSearch = true; + } else { + this.isSearch = false; + this.isActive = false; + this.idWorkspace = 0; + } + }); + } + changeMunicipalitie() { + this.isActiveSearch = false; + if (this.selectMunicipality !== 0) { + this.isActiveSearch = true; + } + } + formatDate(date: string) { + moment.locale('es'); + return moment(date).format('DD/MM/YYYY'); + } + search() { + this.insumosService.GetAttachmentsTypes().subscribe((data) => { + this.dataAttachmentsTypes = data; + }); + this.serviceWorkspaces + .getSuppliesAttachments(this.selectMunicipality) + .subscribe((response) => { + this.suppliesAttachmentsData = response; + this.suppliesAttachmentsData = this.suppliesAttachmentsData.filter( + (element) => { + const isCadastral = element.owners.find( + (data) => data.ownerType === 'CADASTRAL_AUTHORITY' + ); + if (isCadastral) { + return element; + } + } + ); + }); + } + docSoportAttachmentsTypes(files: FileList) { + if (this.selectAttachments === 1 || this.selectAttachments === 3) { + this.ftpAttachmentsTypes = ''; + } + this.ftpAttachmentsTypes = ''; + if (files[0].size / 1024 / 1024 <= environment.sizeFile) { + var re = /zip*/; + if (files[0].type.match(re)) { + this.fileAttachmentsTypes = files[0]; + } else { + if (files[0].size / 1024 / 1024 > environment.sizeFileUnZip) { + this.fileAttachmentsTypes = undefined; + this.toastr.error( + 'Por favor convierta el archivo en .zip antes de subirlo, ya que supera el tamaño de cargue permitido.' + ); + } else { + this.fileAttachmentsTypes = files[0]; + this.validInputAttachmentsTypes = false; + if ( + this.selectAttachments !== 0 && + this.observationsAttachmentsTypes !== '' && + (this.fileAttachmentsTypes !== undefined || + this.ftpAttachmentsTypes !== '') + ) { + this.validInputAttachmentsTypes = true; + } + } + } + } else { + this.toastr.error( + 'No se puede cargar el archivo, supera el tamaño máximo permitido de 190 MB.' + ); + } + } + validAttachmentsTypes() { + this.validInputAttachmentsTypes = false; + if (this.selectAttachments === 2) { + this.fileAttachmentsTypes = undefined; + } + if (this.selectAttachments === 1 || this.selectAttachments === 3) { + this.ftpAttachmentsTypes = ''; + } + if ( + this.selectAttachments !== 0 && + this.observationsAttachmentsTypes !== '' && + this.nameAttachmentsTypes !== '' && + (this.fileAttachmentsTypes !== undefined || + this.ftpAttachmentsTypes !== '') + ) { + this.validInputAttachmentsTypes = true; + } + } + createAttachmentsTypes() { + const form = new FormData(); + form.append('attachmentTypeId', this.selectAttachments.toString()); + if (this.selectAttachments === 2) { + form.append( + 'ftp', + this.ftpAttachmentsTypes + ' ' + this.passftpAttachments + ); + } + if (this.selectAttachments === 1 || this.selectAttachments === 3) { + form.append('file', this.fileAttachmentsTypes); + } + form.append('name', this.nameAttachmentsTypes); + form.append('observations', this.observationsAttachmentsTypes); + this.serviceWorkspaces + .createAttachmentsSupply(this.selectMunicipality, form) + .subscribe((_) => { + this.toastr.success('Ha agregado correctamente el registro.'); + this.validInputAttachmentsTypes = false; + this.serviceWorkspaces + .getSuppliesAttachments(this.selectMunicipality) + .subscribe((response) => { + this.suppliesAttachmentsData = response; + this.selectAttachments = 0; + this.nameAttachmentsTypes = ''; + this.ftpAttachmentsTypes = ''; + this.observationsAttachmentsTypes = ''; + this.fileAttachmentsTypes = undefined; + this.suppliesAttachmentsData = this.suppliesAttachmentsData.filter( + (element) => { + const isCadastral = element.owners.find( + (data) => data.ownerType === 'CADASTRAL_AUTHORITY' + ); + if (isCadastral) { + return element; + } + } + ); + }); + }); + } + openModalDeliveryInfo(modal: any) { + this.modalService.open(modal, { centered: true, scrollable: true }); + } + closeModalDeliveryInfo(option: boolean) { + this.modalService.dismissAll(); + if (option) { + this.createAttachmentsTypes(); + } + } + openModalDelete(idSupplieDelete: number, modal: any) { + this.idSupplieDelete = idSupplieDelete; + this.modalService.open(modal, { centered: true, scrollable: true }); + } + deleteSupplies(idSupplie: number, index?: number) { + console.log('this.idWorkspace: ', this.idWorkspace); + + this.serviceWorkspaces + .deleteSupplies(this.idWorkspace, idSupplie) + .subscribe((_) => { + this.suppliesAttachmentsData.splice(index, 1); + this.toastr.success('Se ha eliminado el insumo'); + }); + } + closeModalDelete(option: boolean, index?: number) { + this.modalService.dismissAll(); + if (option) { + this.deleteSupplies(this.idSupplieDelete, index); + } + } + downloadGetReportAuthority() { + this.serviceWorkspaces + .getReportAuthority(this.selectMunicipality) + .subscribe((data: any) => { + const contentType = data.headers.get('content-type'); + const type = contentType.split(',')[0]; + const dataFile = data.body; + const blob = new Blob([dataFile], { type }); + const url = window.URL.createObjectURL(blob); + saveAs(blob, 'reporte-autoridad.pdf'); + }); + } +} From c637783b64bb89301d9749e8b20d9c711eb0d9df Mon Sep 17 00:00:00 2001 From: MauricioAcosta Date: Fri, 22 Jan 2021 15:43:13 -0500 Subject: [PATCH 02/54] add component by refuse workspace in municipalities --- .../workspace-refuse.component.html | 82 +++++++++++++++++++ .../workspace-refuse.component.scss | 0 .../workspace-refuse.component.spec.ts | 24 ++++++ .../workspace-refuse.component.ts | 66 +++++++++++++++ 4 files changed, 172 insertions(+) create mode 100644 src/app/layout/sections/municipality-management/workspace-refuse/workspace-refuse.component.html create mode 100644 src/app/layout/sections/municipality-management/workspace-refuse/workspace-refuse.component.scss create mode 100644 src/app/layout/sections/municipality-management/workspace-refuse/workspace-refuse.component.spec.ts create mode 100644 src/app/layout/sections/municipality-management/workspace-refuse/workspace-refuse.component.ts diff --git a/src/app/layout/sections/municipality-management/workspace-refuse/workspace-refuse.component.html b/src/app/layout/sections/municipality-management/workspace-refuse/workspace-refuse.component.html new file mode 100644 index 00000000..3255f60f --- /dev/null +++ b/src/app/layout/sections/municipality-management/workspace-refuse/workspace-refuse.component.html @@ -0,0 +1,82 @@ +
+ + +
+
+

Denegar espacio de trabajo

+
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+
+
+
+
+ +
+
+
+ +
+
+
+
diff --git a/src/app/layout/sections/municipality-management/workspace-refuse/workspace-refuse.component.scss b/src/app/layout/sections/municipality-management/workspace-refuse/workspace-refuse.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/src/app/layout/sections/municipality-management/workspace-refuse/workspace-refuse.component.spec.ts b/src/app/layout/sections/municipality-management/workspace-refuse/workspace-refuse.component.spec.ts new file mode 100644 index 00000000..754b92dc --- /dev/null +++ b/src/app/layout/sections/municipality-management/workspace-refuse/workspace-refuse.component.spec.ts @@ -0,0 +1,24 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { WorkspaceRefuseComponent } from './workspace-refuse.component'; + +describe('WorkspaceRefuseComponent', () => { + let component: WorkspaceRefuseComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [WorkspaceRefuseComponent], + }).compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(WorkspaceRefuseComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/layout/sections/municipality-management/workspace-refuse/workspace-refuse.component.ts b/src/app/layout/sections/municipality-management/workspace-refuse/workspace-refuse.component.ts new file mode 100644 index 00000000..e37b81ad --- /dev/null +++ b/src/app/layout/sections/municipality-management/workspace-refuse/workspace-refuse.component.ts @@ -0,0 +1,66 @@ +import { Component, OnInit } from '@angular/core'; +import { Router } from '@angular/router'; +import { ToastrService } from 'ngx-toastr'; +import { JwtHelper } from 'src/app/helpers/jwt'; +import { RoleModel } from 'src/app/helpers/role.model'; +import { ManagersService } from 'src/app/services/managers/managers.service'; +import { WorkspacesService } from 'src/app/services/workspaces/workspaces.service'; + +@Component({ + selector: 'app-workspace-refuse', + templateUrl: './workspace-refuse.component.html', + styleUrls: ['./workspace-refuse.component.scss'], +}) +export class WorkspaceRefuseComponent implements OnInit { + activeManagers: any; + selectManager: number; + munucipalities: any; + selectMunicipality: number; + isAdministrator: boolean; + isActive: boolean; + isActiveSearch: boolean; + constructor( + private serviceWorkspaces: WorkspacesService, + private roles: RoleModel, + private router: Router, + public toastrService: ToastrService, + private serviceManagers: ManagersService + ) { + this.activeManagers = []; + this.selectManager = 0; + this.munucipalities = 0; + this.isAdministrator = false; + this.selectMunicipality = 0; + this.isActiveSearch = false; + } + + ngOnInit(): void { + this.serviceManagers.getManagers().subscribe((data: any) => { + this.activeManagers = data; + }); + const rol = JwtHelper.getUserPublicInformation(); + const role = rol.roles.find((elem) => { + return elem.id === this.roles.administrador; + }); + this.isAdministrator = false; + if (role) { + this.isAdministrator = true; + } + } + + changeDepartament() { + this.serviceWorkspaces + .getMunicipalitiesByManager(this.selectManager) + .subscribe((data) => { + this.munucipalities = data; + }); + } + refuseWorkSpaceActive() { + } + changeMunicipalitie() { + this.isActiveSearch = false; + if (this.selectMunicipality !== 0) { + this.isActiveSearch = true; + } + } +} From e3ec7de1baf4e1acbc46673704b095e831975481 Mon Sep 17 00:00:00 2001 From: MauricioAcosta Date: Fri, 22 Jan 2021 15:46:55 -0500 Subject: [PATCH 03/54] change component by search workspace --- .../workspace-active/workspace-active.component.html | 2 +- .../workspace-active/workspace-active.component.ts | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/app/layout/sections/municipality-management/workspace-active/workspace-active.component.html b/src/app/layout/sections/municipality-management/workspace-active/workspace-active.component.html index 0ac8a468..239c253c 100644 --- a/src/app/layout/sections/municipality-management/workspace-active/workspace-active.component.html +++ b/src/app/layout/sections/municipality-management/workspace-active/workspace-active.component.html @@ -6,7 +6,7 @@
-

Entrega de información

+

Búsqueda de Municipios

diff --git a/src/app/layout/sections/municipality-management/workspace-active/workspace-active.component.ts b/src/app/layout/sections/municipality-management/workspace-active/workspace-active.component.ts index c19ea429..feb5a4b5 100644 --- a/src/app/layout/sections/municipality-management/workspace-active/workspace-active.component.ts +++ b/src/app/layout/sections/municipality-management/workspace-active/workspace-active.component.ts @@ -63,7 +63,6 @@ export class WorkspaceActiveComponent implements OnInit { this.isActive = true; this.router.navigate([ 'gestion/workspace/' + this.selectMunicipality + '/operador', - { tab: 4 }, ]); } else { this.isActive = false; From d0dbb4c2bad07a71be03b95c7316e79c3bc411b5 Mon Sep 17 00:00:00 2001 From: MauricioAcosta Date: Fri, 22 Jan 2021 15:47:25 -0500 Subject: [PATCH 04/54] add routes in menu --- .../components/sidebar/sidebar.component.html | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/app/layout/components/sidebar/sidebar.component.html b/src/app/layout/components/sidebar/sidebar.component.html index 577e0b7c..3505dc1b 100644 --- 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)" + > +   + Busqueda de
+ municipios + + +
  • +   Entrega de
    información
    • +
  • + +   + Denegar + +
  • Date: Fri, 22 Jan 2021 15:48:16 -0500 Subject: [PATCH 05/54] delete delivery information --- .../operator-assignment.component.html | 339 +----------------- .../operator-assignment.component.ts | 188 +--------- 2 files changed, 3 insertions(+), 524 deletions(-) diff --git a/src/app/layout/sections/municipality-management/operator-assignment/operator-assignment.component.html b/src/app/layout/sections/municipality-management/operator-assignment/operator-assignment.component.html index a064d4aa..df663ec8 100644 --- a/src/app/layout/sections/municipality-management/operator-assignment/operator-assignment.component.html +++ b/src/app/layout/sections/municipality-management/operator-assignment/operator-assignment.component.html @@ -62,19 +62,6 @@ people Operador
    • -
  • - - vertical_split Entrega de información - para la Gestión Catastral -
  • - view_list Información para la Gestión - Catastral view_list Insumos - + Habilitación Catastral
    • @@ -384,328 +371,6 @@

    Gestor

    -
    -
    -
    -
    -
    - -
    - Autoridad Catastral, cargue aquí la información que requiere - entregar al Gestor para iniciar la Gestión Catastral del - municipio. -
    -     -
    -
    -
    -
    - -
    - -
    -
    -
    -
    -
    -
    - -
    - Cargue el archivo con la información a entregar. -
    -
    -
    - -
    -
    -
    -
    -
    Credenciales
    -
    - -
    -
    -
    -
    -
    - -
    - Cargue la evidencia de la entrega fisica de la - información. -
    -
    -
    -
    -
    -
    -
    -
    * Nombre
    -
    - -
    -
    -
    -
    -
    -
    - * Observaciones
    - (max. 255 caracteres) -
    -
    - -
    -
    -
    - -
    -
    -
    - -
    -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - -
    #Entregado porNombreFecha de cargueObservaciónEliminar
    {{ index + 1 }}AUTORIDAD CATASTRAL{{ item.name }}{{ formatDate(item.createdAt) }} - - - - delete_forever - - -
    -

    - ¿Está seguro de eliminar el registro? -

    - -
    -
    -
    - Advertencia: La información se borrará - permanentemente del Sistema. -
    -
    -
    -
    - -
    -
    - -
    -
    -     -
    -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -

    - ¿Está seguro de realizar esta entrega al Gestor? -

    - -
    -
    -
    - Advertencia: Esta acción realizará una entrega de información al - Gestor. -
    -
    -
    -
    - -
    -
    - -
    -
    -

    diff --git a/src/app/layout/sections/municipality-management/operator-assignment/operator-assignment.component.ts b/src/app/layout/sections/municipality-management/operator-assignment/operator-assignment.component.ts index 351a6b3a..414af56f 100644 --- a/src/app/layout/sections/municipality-management/operator-assignment/operator-assignment.component.ts +++ b/src/app/layout/sections/municipality-management/operator-assignment/operator-assignment.component.ts @@ -36,18 +36,9 @@ export class OperatorAssignmentComponent implements OnInit { @ViewChild('myInput') myInputVariable: ElementRef; assingOperator: boolean; - dataAttachmentsTypes: any; - selectAttachments: number; - observationsAttachmentsTypes: string; - ftpAttachmentsTypes: string; - validInputAttachmentsTypes: boolean; - fileAttachmentsTypes: any; suppliesAttachmentsData: any; - idSupplieDelete: number; idWorkSpaceMunicipality: number; isChangeDataOperator: boolean; - nameAttachmentsTypes: string; - passftpAttachments: string; isActiveAssignOperator: boolean; constructor( private router: Router, @@ -56,8 +47,7 @@ export class OperatorAssignmentComponent implements OnInit { private toastr: ToastrService, private serviceOperators: OperatorsService, private roles: RoleModel, - private modalService: NgbModal, - private insumosService: SuppliesService + private modalService: NgbModal ) { this.dataWorkSpace = { manager: {}, @@ -91,15 +81,8 @@ export class OperatorAssignmentComponent implements OnInit { this.updateInfoBasic = false; this.assingOperator = false; this.replaceOperator = false; - this.dataAttachmentsTypes = []; - this.selectAttachments = 0; - this.observationsAttachmentsTypes = ''; - this.ftpAttachmentsTypes = ''; - this.validInputAttachmentsTypes = false; this.suppliesAttachmentsData = []; this.isChangeDataOperator = false; - this.nameAttachmentsTypes = ''; - this.passftpAttachments = ''; this.isActiveAssignOperator = false; } @@ -172,26 +155,6 @@ export class OperatorAssignmentComponent implements OnInit { this.operators = response; }); } - if (this.tab === 4) { - this.insumosService.GetAttachmentsTypes().subscribe((data) => { - this.dataAttachmentsTypes = data; - }); - this.serviceWorkspaces - .getSuppliesAttachments(this.selectMunicipality) - .subscribe((response) => { - this.suppliesAttachmentsData = response; - this.suppliesAttachmentsData = this.suppliesAttachmentsData.filter( - (element) => { - const isCadastral = element.owners.find( - (data) => data.ownerType === 'CADASTRAL_AUTHORITY' - ); - if (isCadastral) { - return element; - } - } - ); - }); - } if (this.tab === 5) { this.serviceWorkspaces .getSuppliesAttachments(this.selectMunicipality) @@ -525,31 +488,6 @@ export class OperatorAssignmentComponent implements OnInit { this.modalService.dismissAll(); } } - tab4() { - this.tab = 4; - this.router.navigate([ - 'gestion/workspace/' + this.selectMunicipality + '/operador', - { tab: 4 }, - ]); - this.insumosService.GetAttachmentsTypes().subscribe((data) => { - this.dataAttachmentsTypes = data; - }); - this.serviceWorkspaces - .getSuppliesAttachments(this.selectMunicipality) - .subscribe((response) => { - this.suppliesAttachmentsData = response; - this.suppliesAttachmentsData = this.suppliesAttachmentsData.filter( - (element) => { - const isCadastral = element.owners.find( - (data) => data.ownerType === 'CADASTRAL_AUTHORITY' - ); - if (isCadastral) { - return element; - } - } - ); - }); - } tab5() { this.tab = 5; this.router.navigate([ @@ -572,99 +510,6 @@ export class OperatorAssignmentComponent implements OnInit { ); }); } - docSoportAttachmentsTypes(files: FileList) { - if (this.selectAttachments === 1 || this.selectAttachments === 3) { - this.ftpAttachmentsTypes = ''; - } - this.ftpAttachmentsTypes = ''; - if (files[0].size / 1024 / 1024 <= environment.sizeFile) { - var re = /zip*/; - if (files[0].type.match(re)) { - this.fileAttachmentsTypes = files[0]; - } else { - if (files[0].size / 1024 / 1024 > environment.sizeFileUnZip) { - this.fileAttachmentsTypes = undefined; - this.toastr.error( - 'Por favor convierta el archivo en .zip antes de subirlo, ya que supera el tamaño de cargue permitido.' - ); - } else { - this.fileAttachmentsTypes = files[0]; - this.validInputAttachmentsTypes = false; - if ( - this.selectAttachments !== 0 && - this.observationsAttachmentsTypes !== '' && - (this.fileAttachmentsTypes !== undefined || - this.ftpAttachmentsTypes !== '') - ) { - this.validInputAttachmentsTypes = true; - } - } - } - } else { - this.toastr.error( - 'No se puede cargar el archivo, supera el tamaño máximo permitido de 190 MB.' - ); - } - } - validAttachmentsTypes() { - this.validInputAttachmentsTypes = false; - if (this.selectAttachments === 2) { - this.fileAttachmentsTypes = undefined; - } - if (this.selectAttachments === 1 || this.selectAttachments === 3) { - this.ftpAttachmentsTypes = ''; - } - if ( - this.selectAttachments !== 0 && - this.observationsAttachmentsTypes !== '' && - this.nameAttachmentsTypes !== '' && - (this.fileAttachmentsTypes !== undefined || - this.ftpAttachmentsTypes !== '') - ) { - this.validInputAttachmentsTypes = true; - } - } - createAttachmentsTypes() { - const form = new FormData(); - form.append('attachmentTypeId', this.selectAttachments.toString()); - if (this.selectAttachments === 2) { - form.append( - 'ftp', - this.ftpAttachmentsTypes + ' ' + this.passftpAttachments - ); - } - if (this.selectAttachments === 1 || this.selectAttachments === 3) { - form.append('file', this.fileAttachmentsTypes); - } - form.append('name', this.nameAttachmentsTypes); - form.append('observations', this.observationsAttachmentsTypes); - this.serviceWorkspaces - .createAttachmentsSupply(this.selectMunicipality, form) - .subscribe((_) => { - this.toastr.success('Ha agregado correctamente el registro.'); - this.validInputAttachmentsTypes = false; - this.serviceWorkspaces - .getSuppliesAttachments(this.selectMunicipality) - .subscribe((response) => { - this.suppliesAttachmentsData = response; - this.selectAttachments = 0; - this.nameAttachmentsTypes = ''; - this.ftpAttachmentsTypes = ''; - this.observationsAttachmentsTypes = ''; - this.fileAttachmentsTypes = undefined; - this.suppliesAttachmentsData = this.suppliesAttachmentsData.filter( - (element) => { - const isCadastral = element.owners.find( - (data) => data.ownerType === 'CADASTRAL_AUTHORITY' - ); - if (isCadastral) { - return element; - } - } - ); - }); - }); - } deleteSupplies(idSupplie: number, index?: number) { this.serviceWorkspaces .deleteSupplies(this.idWorkspace, idSupplie) @@ -673,16 +518,6 @@ export class OperatorAssignmentComponent implements OnInit { this.toastr.success('Se ha eliminado el insumo'); }); } - closeModalDelete(option: boolean, index?: number) { - this.modalService.dismissAll(); - if (option) { - this.deleteSupplies(this.idSupplieDelete, index); - } - } - openModalDelete(idSupplieDelete: number, modal: any) { - this.idSupplieDelete = idSupplieDelete; - this.modalService.open(modal, { centered: true, scrollable: true }); - } changeDataOperator() { this.isChangeDataOperator = false; this.isActiveAssignOperator = false; @@ -708,25 +543,4 @@ export class OperatorAssignmentComponent implements OnInit { saveAs(blob, nameSupplie + '.zip'); }); } - downloadGetReportAuthority() { - this.serviceWorkspaces - .getReportAuthority(this.selectMunicipality) - .subscribe((data: any) => { - const contentType = data.headers.get('content-type'); - const type = contentType.split(',')[0]; - const dataFile = data.body; - const blob = new Blob([dataFile], { type }); - const url = window.URL.createObjectURL(blob); - saveAs(blob, 'reporte-autoridad.pdf'); - }); - } - openModalDeliveryInfo(modal: any) { - this.modalService.open(modal, { centered: true, scrollable: true }); - } - closeModalDeliveryInfo(option: boolean) { - this.modalService.dismissAll(); - if (option) { - this.createAttachmentsTypes(); - } - } } From cab5e93bce385e04a85566f445103823aa3eb060 Mon Sep 17 00:00:00 2001 From: MauricioAcosta Date: Fri, 22 Jan 2021 15:49:18 -0500 Subject: [PATCH 06/54] is authority change by strong --- .../sections/supplies/search/search.component.html | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/app/layout/sections/supplies/search/search.component.html b/src/app/layout/sections/supplies/search/search.component.html index 0e66939e..96aa9c00 100644 --- a/src/app/layout/sections/supplies/search/search.component.html +++ b/src/app/layout/sections/supplies/search/search.component.html @@ -118,7 +118,15 @@
    Resultados de Búsqueda
    let index = index " > - {{ item.typeSupply.provider.name }} + + {{ + item.typeSupply.provider.name + }}{{ + item.typeSupply.provider.name + }} + {{ item.name }}{{ From 7d77ef8a1298445a49cd92cb54d1f2541f915dfc Mon Sep 17 00:00:00 2001 From: MauricioAcosta Date: Fri, 22 Jan 2021 15:49:29 -0500 Subject: [PATCH 07/54] add components --- .../gestion-municipio-routing.module.ts | 10 ++++++++++ .../gestion-municipio.module.ts | 4 ++++ 2 files changed, 14 insertions(+) diff --git a/src/app/layout/sections/municipality-management/gestion-municipio-routing.module.ts b/src/app/layout/sections/municipality-management/gestion-municipio-routing.module.ts index bc6ae222..5b9fc212 100644 --- a/src/app/layout/sections/municipality-management/gestion-municipio-routing.module.ts +++ b/src/app/layout/sections/municipality-management/gestion-municipio-routing.module.ts @@ -1,3 +1,5 @@ +import { SuppliesDeliveryComponent } from './supplies-delivery/supplies-delivery.component'; +import { WorkspaceRefuseComponent } from './workspace-refuse/workspace-refuse.component'; import { SearchWorkspaceComponent } from './search-workspace/search-workspace.component'; import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; @@ -22,6 +24,14 @@ const routes: Routes = [ path: 'workspace/asignado', component: SearchWorkspaceComponent, }, + { + path: 'workspace/delivery', + component: SuppliesDeliveryComponent, + }, + { + path: 'workspace/refuse', + component: WorkspaceRefuseComponent, + }, ]; @NgModule({ diff --git a/src/app/layout/sections/municipality-management/gestion-municipio.module.ts b/src/app/layout/sections/municipality-management/gestion-municipio.module.ts index 5791f9ba..8dd33e50 100644 --- a/src/app/layout/sections/municipality-management/gestion-municipio.module.ts +++ b/src/app/layout/sections/municipality-management/gestion-municipio.module.ts @@ -1,3 +1,4 @@ +import { WorkspaceRefuseComponent } from './workspace-refuse/workspace-refuse.component'; import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; @@ -10,6 +11,7 @@ import { BsComponentModule } from '../../bs-component/bs-component.module'; import { WorkspaceActiveComponent } from './workspace-active/workspace-active.component'; import { NgSelect2Module } from 'ng-select2'; import { SearchWorkspaceComponent } from './search-workspace/search-workspace.component'; +import { SuppliesDeliveryComponent } from './supplies-delivery/supplies-delivery.component'; @NgModule({ declarations: [ @@ -17,6 +19,8 @@ import { SearchWorkspaceComponent } from './search-workspace/search-workspace.co OperatorAssignmentComponent, WorkspaceActiveComponent, SearchWorkspaceComponent, + WorkspaceRefuseComponent, + SuppliesDeliveryComponent, ], imports: [ CommonModule, From 7202f4a0e8528555c95f93ca6e8b0079aeb9c146 Mon Sep 17 00:00:00 2001 From: MauricioAcosta Date: Tue, 26 Jan 2021 12:40:55 -0500 Subject: [PATCH 08/54] change name --- src/app/layout/components/sidebar/sidebar.component.html | 4 ++-- .../supplies-delivery/supplies-delivery.component.html | 2 +- .../workspace-refuse/workspace-refuse.component.html | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/app/layout/components/sidebar/sidebar.component.html b/src/app/layout/components/sidebar/sidebar.component.html index 3505dc1b..462d4002 100644 --- a/src/app/layout/components/sidebar/sidebar.component.html +++ b/src/app/layout/components/sidebar/sidebar.component.html @@ -40,7 +40,7 @@ (click)="isCollapsed(listMenu.gestion)" >   - Busqueda de
    + Búsqueda de
    municipios @@ -62,7 +62,7 @@ (click)="isCollapsed(listMenu.gestion)" >   - Denegar + Desasignar
  • diff --git a/src/app/layout/sections/municipality-management/supplies-delivery/supplies-delivery.component.html b/src/app/layout/sections/municipality-management/supplies-delivery/supplies-delivery.component.html index 81d5e560..3ca78fe6 100644 --- a/src/app/layout/sections/municipality-management/supplies-delivery/supplies-delivery.component.html +++ b/src/app/layout/sections/municipality-management/supplies-delivery/supplies-delivery.component.html @@ -6,7 +6,7 @@
    -

    Entrega de insumos - Habilitación Catastral

    +

    Entrega de información - Habilitación Catastral

    diff --git a/src/app/layout/sections/municipality-management/workspace-refuse/workspace-refuse.component.html b/src/app/layout/sections/municipality-management/workspace-refuse/workspace-refuse.component.html index 3255f60f..449fb720 100644 --- a/src/app/layout/sections/municipality-management/workspace-refuse/workspace-refuse.component.html +++ b/src/app/layout/sections/municipality-management/workspace-refuse/workspace-refuse.component.html @@ -6,7 +6,7 @@
    -

    Denegar espacio de trabajo

    +

    Desasignar espacio de trabajo

    @@ -68,7 +68,7 @@

    Denegar espacio de trabajo

    (click)="refuseWorkSpaceActive()" [disabled]="!isActiveSearch" > - Denegar + Desasignar
    From 4f3e7e2943c7d28cba148985bcf8178b535712a6 Mon Sep 17 00:00:00 2001 From: MauricioAcosta Date: Tue, 26 Jan 2021 13:11:32 -0500 Subject: [PATCH 09/54] change text --- .../operator-assignment/operator-assignment.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/layout/sections/municipality-management/operator-assignment/operator-assignment.component.html b/src/app/layout/sections/municipality-management/operator-assignment/operator-assignment.component.html index df663ec8..8771b7f1 100644 --- a/src/app/layout/sections/municipality-management/operator-assignment/operator-assignment.component.html +++ b/src/app/layout/sections/municipality-management/operator-assignment/operator-assignment.component.html @@ -71,7 +71,7 @@ (click)="tab5()" aria-controls="messages" > - view_list Insumos - + view_list Información - Habilitación Catastral
    • @@ -385,7 +385,7 @@

    Gestor

    >
    Gestor, descargue o consulte la información suministrada por - la Autoridad Catastral para la Gestión Catastral del + la Autoridad Catastral para iniciar la Gestión Catastral del municipio asignado.
    From 38658a1922d3025ab6249e8e44672588360e412d Mon Sep 17 00:00:00 2001 From: MauricioAcosta Date: Wed, 27 Jan 2021 11:57:20 -0500 Subject: [PATCH 10/54] feat: add recover and reset password --- src/app/login/login.component.html | 290 ++++++++++++++++++++++--- src/app/login/login.component.ts | 81 ++++++- src/app/services/auth/login.service.ts | 28 ++- 3 files changed, 354 insertions(+), 45 deletions(-) diff --git a/src/app/login/login.component.html b/src/app/login/login.component.html index 42f96316..d210d0e7 100644 --- a/src/app/login/login.component.html +++ b/src/app/login/login.component.html @@ -3,48 +3,105 @@ diff --git a/src/app/login/login.component.ts b/src/app/login/login.component.ts index 009ccc0f..bf9ffa6f 100644 --- a/src/app/login/login.component.ts +++ b/src/app/login/login.component.ts @@ -1,5 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { Router } from '@angular/router'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { ToastrService } from 'ngx-toastr'; import { environment } from 'src/environments/environment'; import { LoginService } from '../services/auth/login.service'; @@ -11,27 +13,88 @@ import { LoginService } from '../services/auth/login.service'; export class LoginComponent implements OnInit { loginData = { username: '', - password: '' + password: '', }; - + emailByRecover: string; + buttonRecover: boolean; + codeRecover: string; + newPassword: string; + confirmationNewPassword: string; + buttonReset: boolean; constructor( public router: Router, - private serviceAUTH: LoginService - ) { } + private serviceAUTH: LoginService, + private modalService: NgbModal, + private toast: ToastrService + ) { + this.emailByRecover = ''; + this.buttonRecover = false; + this.codeRecover = ''; + this.newPassword = ''; + this.confirmationNewPassword = ''; + } - ngOnInit() { } + ngOnInit() {} onLoggedin() { - this.serviceAUTH.login(this.loginData.username.toLowerCase(), this.loginData.password).subscribe( - data => { + this.serviceAUTH + .login(this.loginData.username.toLowerCase(), this.loginData.password) + .subscribe((data) => { localStorage.setItem(environment.nameTokenSession, data.access_token); this.router.navigate(['inicio']); - } - ); + }); } public onKey(event: any) { if (event.key === 'Enter') { this.onLoggedin(); } } + recoverPassword(modal: any) { + this.modalService.open(modal, { centered: true, scrollable: true }); + } + closeModalRecover(modal: any) { + if (this.buttonRecover) { + this.serviceAUTH + .recoverPassword(this.emailByRecover) + .subscribe((response: any) => { + console.log(response); + this.toast.success(response.message); + this.modalService.dismissAll(); + this.modalService.open(modal, { centered: true, scrollable: true }); + }); + } + } + validateEmail(email) { + var re = /^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/; + return re.test(email); + } + validfield() { + this.buttonRecover = false; + if (this.validateEmail(this.emailByRecover)) { + this.buttonRecover = true; + } + } + validfield2() { + this.buttonReset = false; + if ( + this.codeRecover !== '' && + this.newPassword !== '' && + this.confirmationNewPassword !== '' + ) { + this.buttonReset = true; + } + } + closeModalReset() { + if (this.newPassword === this.confirmationNewPassword) { + this.serviceAUTH + .ResetPassword(this.emailByRecover, this.codeRecover, this.newPassword) + .subscribe((response: any) => { + console.log(response); + this.toast.success(response.message); + this.modalService.dismissAll(); + }); + } else { + this.toast.error('Las contraseñas no son iguales.'); + } + } } diff --git a/src/app/services/auth/login.service.ts b/src/app/services/auth/login.service.ts index a7a7d5bc..3ec2953f 100644 --- a/src/app/services/auth/login.service.ts +++ b/src/app/services/auth/login.service.ts @@ -4,9 +4,8 @@ import { environment } from 'src/environments/environment'; import { Observable } from 'rxjs'; @Injectable({ - providedIn: 'root' + providedIn: 'root', }) - export class LoginService { data = []; url: string; @@ -15,26 +14,43 @@ export class LoginService { this.url = environment.apiBaseUrlPrefix; } login(username: string, password: string): Observable { - const encoded = btoa(environment.clientUsername + ':' + environment.clientPassword); + const encoded = btoa( + environment.clientUsername + ':' + environment.clientPassword + ); const body = new HttpParams() .set('username', username) .set('password', password) .set('grant_type', 'password'); - return this.httpClient.post(this.url + '/security/oauth/token', + return this.httpClient.post( + this.url + '/security/oauth/token', body.toString(), { headers: new HttpHeaders() .set('Content-Type', 'application/x-www-form-urlencoded') - .set('Authorization', 'Basic ' + encoded) + .set('Authorization', 'Basic ' + encoded), } ); } getSessions() { - return this.httpClient.get(this.url + '/auth/session', { observe: 'response' }); + return this.httpClient.get(this.url + '/auth/session', { + observe: 'response', + }); } logout() { localStorage.removeItem(environment.nameTokenSession); localStorage.removeItem('showMenu'); } + recoverPassword(email: string) { + return this.httpClient.put(this.url + '/administration/v1/users/recover', { + email: email, + }); + } + ResetPassword(email: string, code: string, newPassword: string) { + return this.httpClient.put(this.url + '/administration/v1/users/reset', { + email: email, + code: code, + newPassword: newPassword, + }); + } } From ab8eb68ecfcd62411c1d7a153477c2e7d229a95c Mon Sep 17 00:00:00 2001 From: MauricioAcosta Date: Sun, 21 Feb 2021 23:55:38 -0500 Subject: [PATCH 11/54] feat: assign manager by workspace --- .../assign-workspace/workspace.component.html | 54 ++++++- .../assign-workspace/workspace.component.ts | 137 ++++++++++++++---- .../updateInformationByWorkspace.interface.ts | 4 + .../validateMunicipalities.interface.ts | 8 + .../cadastral-authority.service.spec.ts | 16 ++ .../cadastral-authority.service.ts | 90 ++++++++++++ 6 files changed, 275 insertions(+), 34 deletions(-) create mode 100644 src/app/models/updateInformationByWorkspace.interface.ts create mode 100644 src/app/models/validateMunicipalities.interface.ts create mode 100644 src/app/services/cadastral-authority/cadastral-authority.service.spec.ts create mode 100644 src/app/services/cadastral-authority/cadastral-authority.service.ts diff --git a/src/app/layout/sections/municipality-management/assign-workspace/workspace.component.html b/src/app/layout/sections/municipality-management/assign-workspace/workspace.component.html index 8217e4b1..b05bbd0a 100644 --- a/src/app/layout/sections/municipality-management/assign-workspace/workspace.component.html +++ b/src/app/layout/sections/municipality-management/assign-workspace/workspace.component.html @@ -21,7 +21,7 @@

    Asignación de Gestor Catastral

    name="managers" id="managers" [(ngModel)]="dataCreateWorkSpace.managerCode" - (change)="changeData()" + (change)="changeDepartament()" >
    +
    + +
    + + + + + + + + + + + + + + + +
    MunicipioGestores asignadosObservación
    {{ item.municipalityName }} +
    + {{ element.manager.alias }} +
    +     		+
    + +
    +
    +
    +
    + diff --git a/src/app/layout/sections/municipality-management/assign-workspace/workspace.component.ts b/src/app/layout/sections/municipality-management/assign-workspace/workspace.component.ts index 3a782abb..223d2237 100644 --- a/src/app/layout/sections/municipality-management/assign-workspace/workspace.component.ts +++ b/src/app/layout/sections/municipality-management/assign-workspace/workspace.component.ts @@ -1,3 +1,5 @@ +import { ValidateMunicipalitiesInterface } from './../../../../models/validateMunicipalities.interface'; +import { CadastralAuthorityService } from './../../../../services/cadastral-authority/cadastral-authority.service'; import { Component, OnInit, ViewChild, ElementRef } from '@angular/core'; import { WorkspacesService } from 'src/app/services/workspaces/workspaces.service'; import { ManagersService } from 'src/app/services/managers/managers.service'; @@ -17,7 +19,6 @@ import { Options } from 'select2'; export class WorkspaceComponent implements OnInit { public options: Options; public munucipalities: Array; - activeManagers: any; docsSoport: File; departments: any; @@ -30,12 +31,16 @@ export class WorkspaceComponent implements OnInit { createActive: boolean; selectAllMunicipalities: boolean; viewSelectAllMunicipalities: boolean; + municipalitieValidate: ValidateMunicipalitiesInterface[]; + createActive2: boolean; + viewBotton: boolean; constructor( private serviceManagers: ManagersService, private serviceWorkspaces: WorkspacesService, private roles: RoleModel, private toastr: ToastrService, - private modalService: NgbModal + private modalService: NgbModal, + private cadastralAuthorityService: CadastralAuthorityService ) { this.activeManagers = []; this.departments = []; @@ -62,8 +67,11 @@ export class WorkspaceComponent implements OnInit { width: '450', }; this.createActive = false; + this.createActive2 = false; this.selectAllMunicipalities = false; this.viewSelectAllMunicipalities = false; + this.municipalitieValidate = []; + this.viewBotton = false; } ngOnInit() { @@ -82,6 +90,7 @@ export class WorkspaceComponent implements OnInit { }); } docSoport(file: File) { + this.changeData(); if (file[0].size / 1024 / 1024 <= environment.sizeFile) { const re = /pdf*/; if (file[0].type.match(re)) { @@ -103,21 +112,24 @@ export class WorkspaceComponent implements OnInit { changeDepartament() { this.selectAllMunicipalities = false; this.dataCreateWorkSpace.municipalityId = ['0']; - this.serviceWorkspaces - .getMunicipalitiesThatNotHasWorkspaces( - Number(this.dataCreateWorkSpace.selectDepartment) - ) - .subscribe((data: any) => { - this.viewSelectAllMunicipalities = true; - this.changeData(); - this.munucipalities = []; - data.forEach((element) => { - this.munucipalities.push({ - id: element.id + '', - text: element.name, + if (this.dataCreateWorkSpace.selectDepartment !== '0') { + this.cadastralAuthorityService + .getMunicipalities( + this.dataCreateWorkSpace.managerCode, + this.dataCreateWorkSpace.selectDepartment + ) + .subscribe((data: any) => { + this.viewSelectAllMunicipalities = true; + this.changeData(); + this.munucipalities = []; + data.forEach((element) => { + this.munucipalities.push({ + id: element.id + '', + text: element.name, + }); }); }); - }); + } } createWorkSpace() { if (this.dataCreateWorkSpace.supportFile === '') { @@ -125,26 +137,77 @@ export class WorkspaceComponent implements OnInit { } else if (this.dataCreateWorkSpace.observations === '') { this.toastr.error('Las observaciones son obligatorias.'); } else { - this.serviceWorkspaces - .createWorkspace(this.dataCreateWorkSpace) - .subscribe((_) => { - this.toastr.success( - 'Se ha asignado el(los) espacio(s) de trabajo para el(los) municipio(s) seleccionado(s).' + let formdata = new FormData(); + formdata.append('managerCode', this.dataCreateWorkSpace.managerCode); + formdata.append('startDate', this.dataCreateWorkSpace.startDate); + formdata.append('observations', this.dataCreateWorkSpace.observations); + formdata.append('supportFile', this.dataCreateWorkSpace.supportFile); + for ( + let index = 0; + index < this.dataCreateWorkSpace.municipalityId.length; + index++ + ) { + let validate = this.municipalitieValidate.find( + (element) => + element.municipalityId === + this.dataCreateWorkSpace.municipalityId[index] + ); + formdata.append( + 'municipalities[' + index + '].municipalityId', + this.dataCreateWorkSpace.municipalityId[index] + ); + if (validate) { + formdata.append( + 'municipalities[' + index + '].observations', + this.municipalitieValidate[index].observation ); - this.dataCreateWorkSpace = { - selectDepartment: '0', - supportFile: '', - managerCode: '0', - municipalityId: ['0'], - observations: '', - startDate: '', - }; - this.createActive = false; - this.viewSelectAllMunicipalities = false; - this.selectAllMunicipalities = false; - }); + } + } + this.cadastralAuthorityService.assignManager(formdata).subscribe((_) => { + this.toastr.success( + 'Se ha asignado el(los) espacio(s) de trabajo para el(los) municipio(s) seleccionado(s).' + ); + this.dataCreateWorkSpace = { + selectDepartment: '0', + supportFile: '', + managerCode: '0', + municipalityId: ['0'], + observations: '', + startDate: '', + }; + this.createActive = false; + this.createActive2 = false; + this.viewBotton = false; + this.viewSelectAllMunicipalities = false; + this.selectAllMunicipalities = false; + this.municipalitieValidate = []; + this.myInputVariable.nativeElement.value = ''; + }); } } + validateMunicipalities() { + let validateMunicipalities = this.dataCreateWorkSpace.municipalityId.join(); + this.cadastralAuthorityService + .validateMunicipalities(validateMunicipalities) + .subscribe((element: ValidateMunicipalitiesInterface[]) => { + this.municipalitieValidate = element.filter((x) => { + if (x.conflict === true) { + return { ...x, observation: '' }; + } + }); + this.viewBotton = true; + if (this.municipalitieValidate.length === 0) { + this.toastr.success( + 'Puede asignar los municipios al gestor seleccionado, por favor haga click en Asignar Gestor Catastral' + ); + this.createActive2 = true; + } else { + this.toastr.info( + 'Tiene municipios en conflicto asignados ya a otro gestor, por favor completa los siguientes campos para poder ser asignados.' + ); + } + }); + } openModal(modal: any) { this.modalService.open(modal, { centered: true, scrollable: true }); } @@ -180,4 +243,14 @@ export class WorkspaceComponent implements OnInit { this.dataCreateWorkSpace.municipalityId = ['0']; } } + validateWriteObservation() { + const validate = this.municipalitieValidate.find( + (x) => x.observation === '' + ); + if (validate) { + this.createActive2 = false; + } else { + this.createActive2 = true; + } + } } diff --git a/src/app/models/updateInformationByWorkspace.interface.ts b/src/app/models/updateInformationByWorkspace.interface.ts new file mode 100644 index 00000000..37073cc8 --- /dev/null +++ b/src/app/models/updateInformationByWorkspace.interface.ts @@ -0,0 +1,4 @@ +export type UpdateInformationByWorkspace = { + startDate: string; + observations: string; +}; diff --git a/src/app/models/validateMunicipalities.interface.ts b/src/app/models/validateMunicipalities.interface.ts new file mode 100644 index 00000000..bbbaf2fb --- /dev/null +++ b/src/app/models/validateMunicipalities.interface.ts @@ -0,0 +1,8 @@ +export type ValidateMunicipalitiesInterface = { + municipalityId: number; + municipalityName: string; + municipalityCode: string; + conflict: boolean; + managers: []; + observation: string; +}; diff --git a/src/app/services/cadastral-authority/cadastral-authority.service.spec.ts b/src/app/services/cadastral-authority/cadastral-authority.service.spec.ts new file mode 100644 index 00000000..4637f34f --- /dev/null +++ b/src/app/services/cadastral-authority/cadastral-authority.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { CadastralAuthorityService } from './cadastral-authority.service'; + +describe('CadastralAuthorityService', () => { + let service: CadastralAuthorityService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(CadastralAuthorityService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/services/cadastral-authority/cadastral-authority.service.ts b/src/app/services/cadastral-authority/cadastral-authority.service.ts new file mode 100644 index 00000000..79644b79 --- /dev/null +++ b/src/app/services/cadastral-authority/cadastral-authority.service.ts @@ -0,0 +1,90 @@ +import { UpdateInformationByWorkspace } from './../../models/updateInformationByWorkspace.interface'; +import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { environment } from 'src/environments/environment'; + +@Injectable({ + providedIn: 'root', +}) +export class CadastralAuthorityService { + url: string; + constructor(private httpClient: HttpClient) { + this.url = environment.apiBaseUrlPrefix; + } + + /** + * Get municipalities where manager does not belong in + */ + public getMunicipalities(managerCode: number, departmentId: number) { + return this.httpClient.get( + this.url + + '/workspaces/v2/municipalities/' + + managerCode + + '/not-belong/departments/' + + departmentId + ); + } + /** + * unassignManagerFromMunicipality + */ + public unassignManagerFromMunicipality( + municipalityId: number, + managerCode: number + ) { + return this.httpClient.delete( + this.url + + '/workspaces/v1/workspaces/unassign/' + + municipalityId + + '/managers/' + + managerCode + ); + } + /** + * validateMunicipalities + */ + public validateMunicipalities(municipalities: string) { + return this.httpClient.get( + this.url + + '/workspaces/v2/workspaces/validate-municipalities-to-assign?municipalities=' + + municipalities + ); + } + /** + * assignManager + */ + public assignManager(data: FormData) { + return this.httpClient.post( + this.url + '/workspaces/v2/workspaces/assign-manager', + data + ); + } + /** + * downloadSupportFromManager + */ + public downloadSupportFromManager(workspaceId: number, managerCode: number) { + return this.httpClient.get( + this.url + + '/workspaces/v2/workspaces/' + + workspaceId + + '/download-support-manager/' + + managerCode + ); + } + /** + * updateManagerInformationFromWorkspace + */ + public updateManagerInformationFromWorkspace( + workspaceId: number, + managerCode: number, + data: UpdateInformationByWorkspace + ) { + return this.httpClient.put( + this.url + + '/workspaces/v2/workspaces/' + + workspaceId + + '/managers/' + + managerCode, + data + ); + } +} From 7ba9d6e1d5fceaf852511506d956d41ee7a3429f Mon Sep 17 00:00:00 2001 From: MauricioAcosta Date: Mon, 22 Feb 2021 00:05:02 -0500 Subject: [PATCH 12/54] Unassign Manager from municipality --- .../workspace-refuse.component.ts | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/app/layout/sections/municipality-management/workspace-refuse/workspace-refuse.component.ts b/src/app/layout/sections/municipality-management/workspace-refuse/workspace-refuse.component.ts index e37b81ad..9eee92a5 100644 --- a/src/app/layout/sections/municipality-management/workspace-refuse/workspace-refuse.component.ts +++ b/src/app/layout/sections/municipality-management/workspace-refuse/workspace-refuse.component.ts @@ -3,6 +3,7 @@ import { Router } from '@angular/router'; import { ToastrService } from 'ngx-toastr'; import { JwtHelper } from 'src/app/helpers/jwt'; import { RoleModel } from 'src/app/helpers/role.model'; +import { CadastralAuthorityService } from 'src/app/services/cadastral-authority/cadastral-authority.service'; import { ManagersService } from 'src/app/services/managers/managers.service'; import { WorkspacesService } from 'src/app/services/workspaces/workspaces.service'; @@ -21,8 +22,8 @@ export class WorkspaceRefuseComponent implements OnInit { isActiveSearch: boolean; constructor( private serviceWorkspaces: WorkspacesService, + private cadastralAuthorityService: CadastralAuthorityService, private roles: RoleModel, - private router: Router, public toastrService: ToastrService, private serviceManagers: ManagersService ) { @@ -56,6 +57,18 @@ export class WorkspaceRefuseComponent implements OnInit { }); } refuseWorkSpaceActive() { + this.cadastralAuthorityService + .unassignManagerFromMunicipality( + this.selectMunicipality, + this.selectManager + ) + .subscribe((_) => { + this.selectManager = 0; + this.isAdministrator = false; + this.selectMunicipality = 0; + this.isActiveSearch = false; + this.toastrService.success('Ha desasignado el espacio de trabajo.'); + }); } changeMunicipalitie() { this.isActiveSearch = false; From 7db1ab6288b3208e2f85edfdd05619f8a01a8639 Mon Sep 17 00:00:00 2001 From: MauricioAcosta Date: Mon, 22 Feb 2021 08:13:57 -0500 Subject: [PATCH 13/54] :construction: edit information workspace --- .../operator-assignment.component.html | 283 ++++++++---------- .../operator-assignment.component.ts | 95 +++--- .../search-workspace.component.html | 60 +--- .../search-workspace.component.ts | 21 +- .../cadastral-authority.service.ts | 3 +- 5 files changed, 160 insertions(+), 302 deletions(-) diff --git a/src/app/layout/sections/municipality-management/operator-assignment/operator-assignment.component.html b/src/app/layout/sections/municipality-management/operator-assignment/operator-assignment.component.html index 8771b7f1..cd86ef83 100644 --- a/src/app/layout/sections/municipality-management/operator-assignment/operator-assignment.component.html +++ b/src/app/layout/sections/municipality-management/operator-assignment/operator-assignment.component.html @@ -38,7 +38,7 @@ home Información Básica -
  • +
  • {{ formatDate(dataWorkSpace.createdAt) }}
    • -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - - -
    -

    Gestor

    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    -
    {{ formatDate(dataWorkSpace.manager.createdAt) }}
    -
    -
    - -
    -
    -
    -
    -
    - - - - - - - - - - - - - - + +
    IDRepositorio DocumentalHitoEntregado porFecha de Creación
    {{ i + 1 }} - soporte - + + + + + + + + + + + + + + + + + + + + + + +
    +

    + ¿Está seguro de actualizar la información? +

    + +
    +
    +
    + Advertencia: Esta acción actualizará la información del + espacio de trabajo. +
    +
    +
    +
    +
    - - - - -
    GestorNITFecha de AsignaciónSoporteFecha de inicioObservacionesOpciones
    {{ item.manager.alias }} + {{ item.manager.taxIdentificationNumber }} + + {{ formatDate(item.manager.createdAt) }} + + soporte + + preview + + + + + + +
    + + +
    +     		{{ item.milestone.name }} -
    - AUTORIDAD CATASTRAL -
    -
    - {{ dataWorkSpace.manager.alias }} -
    -     		{{ formatDate(item.createdAt) }}
    - - + No + + +
    + +
    + + +
    @@ -492,45 +494,4 @@
    - - -
    -

    ¿Está seguro de actualizar la información?

    - -
    -
    -
    - Advertencia: Esta acción actualizará la información del espacio de - trabajo. -
    -
    -
    -
    - -
    -
    - -
    -
    -
    diff --git a/src/app/layout/sections/municipality-management/operator-assignment/operator-assignment.component.ts b/src/app/layout/sections/municipality-management/operator-assignment/operator-assignment.component.ts index 414af56f..ab7c2041 100644 --- a/src/app/layout/sections/municipality-management/operator-assignment/operator-assignment.component.ts +++ b/src/app/layout/sections/municipality-management/operator-assignment/operator-assignment.component.ts @@ -9,7 +9,7 @@ import { RoleModel } from 'src/app/helpers/role.model'; import { saveAs } from 'file-saver'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { environment } from 'src/environments/environment'; -import { SuppliesService } from 'src/app/services/supplies/supplies.service'; +import { CadastralAuthorityService } from 'src/app/services/cadastral-authority/cadastral-authority.service'; const moment = _moment; @Component({ @@ -47,7 +47,8 @@ export class OperatorAssignmentComponent implements OnInit { private toastr: ToastrService, private serviceOperators: OperatorsService, private roles: RoleModel, - private modalService: NgbModal + private modalService: NgbModal, + private cadastralAuthorityService: CadastralAuthorityService ) { this.dataWorkSpace = { manager: {}, @@ -61,12 +62,7 @@ export class OperatorAssignmentComponent implements OnInit { this.munucipalities = []; this.selectDepartment = 0; this.selectMunicipality = 0; - this.editForm = { - municipalityArea: true, - numberAlphanumericParcels: true, - startDate: true, - observations: true, - }; + this.editForm = []; this.dataSoports = []; this.operators = []; this.selectOperator = 0; @@ -123,6 +119,8 @@ export class OperatorAssignmentComponent implements OnInit { .getWorkSpace(this.idWorkspace) .subscribe((response: any) => { this.dataWorkSpace = response; + console.log(this.dataWorkSpace); + this.selectDepartment = this.dataWorkSpace.municipality.department.id; if (this.dataWorkSpace.operators.length > 0) { this.replaceOperator = true; @@ -143,13 +141,6 @@ export class OperatorAssignmentComponent implements OnInit { ); } }); - if (this.tab === 2) { - this.serviceWorkspaces - .getSupportsByWorkSpace(this.idWorkspace) - .subscribe((response) => { - this.dataSoports = response; - }); - } if (this.tab === 3) { this.serviceOperators.getOperatorsByFilters().subscribe((response) => { this.operators = response; @@ -214,6 +205,12 @@ export class OperatorAssignmentComponent implements OnInit { .getWorkSpace(this.idWorkspace) .subscribe((response: any) => { this.dataWorkSpace = response; + this.dataWorkSpace.managers.forEach((_) => { + this.editForm.push({ + startDate: true, + observations: true, + }); + }); if (this.dataWorkSpace.operators.length > 0) { this.replaceOperator = true; this.dataOperatorsWorkSpace = this.clone( @@ -233,13 +230,6 @@ export class OperatorAssignmentComponent implements OnInit { ); } }); - if (this.tab === 2) { - this.serviceWorkspaces - .getSupportsByWorkSpace(this.idWorkspace) - .subscribe((response) => { - this.dataSoports = response; - }); - } if (this.tab === 3) { this.serviceOperators.getOperatorsByFilters().subscribe((response) => { this.operators = response; @@ -315,29 +305,20 @@ export class OperatorAssignmentComponent implements OnInit { ]); } } - changeUpdate() { - this.editForm = { - municipalityArea: false, - numberAlphanumericParcels: false, + changeUpdate(index: number) { + this.editForm[index] = { startDate: false, observations: false, }; } - update() { + update(index: number) { const dataUpdate = new FormData(); dataUpdate.append('startDate', this.dataWorkSpace.startDate); dataUpdate.append('observations', this.dataWorkSpace.observations); - dataUpdate.append( - 'numberAlphanumericParcels', - this.dataWorkSpace.numberAlphanumericParcels - ); - dataUpdate.append('municipalityArea', this.dataWorkSpace.municipalityArea); this.serviceWorkspaces .updateWorkSpace(this.idWorkspace, dataUpdate) .subscribe((_) => { - this.editForm = { - municipalityArea: true, - numberAlphanumericParcels: true, + this.editForm[index] = { startDate: true, observations: true, }; @@ -351,14 +332,6 @@ export class OperatorAssignmentComponent implements OnInit { { tab: 1 }, ]); } - getSopports() { - this.tab = 2; - this.router.navigate([ - 'gestion/workspace/' + this.selectMunicipality + '/operador', - { tab: 2 }, - ]); - this.init(); - } getOperator() { this.tab = 3; this.router.navigate([ @@ -449,14 +422,14 @@ export class OperatorAssignmentComponent implements OnInit { openModal(modal: any) { this.modalService.open(modal, { centered: true, scrollable: true }); } - public onKey(event: any) { + public onKey(event: any, modal: any) { if (event.key === 'Enter') { - this.update(); + this.openModalUpdate(modal); } } - previewSupplies(idSupport: number, item: any) { - this.serviceWorkspaces - .downloadSupport(this.idWorkspace, idSupport) + previewSupplies(managerCode: number, index: number) { + this.cadastralAuthorityService + .downloadSupportFromManager(this.idWorkspace, managerCode) .subscribe((data: any) => { const contentType = data.headers.get('content-type'); const type = contentType.split(',')[0]; @@ -464,25 +437,25 @@ export class OperatorAssignmentComponent implements OnInit { const blob = new Blob([dataFile], { type }); const url = window.URL.createObjectURL(blob); const preview = window.open(url, 'soporte'); - if (item.milestone.id === 1) { - setTimeout(() => { - preview.document.title = 'Soporte Autoridad Catastral'; - }, 500); - } - if (item.milestone.id === 3) { - setTimeout(() => { - preview.document.title = - 'Soporte Gestor ' + this.dataWorkSpace.manager.alias; - }, 500); - } + // if (item.milestone.id === 1) { + // setTimeout(() => { + // preview.document.title = 'Soporte Autoridad Catastral'; + // }, 500); + // } + // if (item.milestone.id === 3) { + setTimeout(() => { + preview.document.title = + 'Soporte Gestor ' + this.dataWorkSpace.managers[index].alias; + }, 500); + // } }); } openModalUpdate(modal: any) { this.modalService.open(modal, { centered: true, scrollable: true }); } - closeModalUpdate(option: boolean) { + closeModalUpdate(option: boolean, index?: number) { if (option) { - this.update(); + this.update(index); this.modalService.dismissAll(); } else { this.modalService.dismissAll(); diff --git a/src/app/layout/sections/municipality-management/search-workspace/search-workspace.component.html b/src/app/layout/sections/municipality-management/search-workspace/search-workspace.component.html index 737a51dd..7f5a5ad4 100644 --- a/src/app/layout/sections/municipality-management/search-workspace/search-workspace.component.html +++ b/src/app/layout/sections/municipality-management/search-workspace/search-workspace.component.html @@ -64,69 +64,11 @@

    Búsqueda de Municipios

    -
    -
    - -
    -
    -
    -
    -

    Espacios de Trabajo

    -
    -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - -
    IDGestorDepartamentoMunicipioFecha de InicioObservacionesVer
    {{ i + 1 }}{{ item.manager.alias }}{{ item.municipality.department.name }}{{ item.municipality.name }}{{ formatDate(item.startDate) }} - - - double_arrow -
    -
    -
    -
    -
    -
    diff --git a/src/app/layout/sections/municipality-management/search-workspace/search-workspace.component.ts b/src/app/layout/sections/municipality-management/search-workspace/search-workspace.component.ts index dcb82f9b..69d444e4 100644 --- a/src/app/layout/sections/municipality-management/search-workspace/search-workspace.component.ts +++ b/src/app/layout/sections/municipality-management/search-workspace/search-workspace.component.ts @@ -63,26 +63,7 @@ export class SearchWorkspaceComponent implements OnInit { moment.locale('es'); return moment(date).format('DD/MM/YYYY'); } - searchWorkSpaceActive() { - this.serviceWorkspaces - .GetWorkspacesByLocation( - this.selectDepartment, - this.selectMunicipality === 0 ? null : this.selectMunicipality - ) - .subscribe((response: any) => { - if (response.length > 0) { - this.listWorkSpace = response; - this.isActive = true; - } else { - this.isActive = false; - this.toastrService.error( - 'No existe un espacio de trabajo para el municipio.' - ); - } - }); - } - updateWorkSpace(item: any) { - this.selectMunicipality = item.municipality.id; + updateWorkSpace() { this.router.navigate([ 'gestion/workspace/' + this.selectMunicipality + '/operador', ]); diff --git a/src/app/services/cadastral-authority/cadastral-authority.service.ts b/src/app/services/cadastral-authority/cadastral-authority.service.ts index 79644b79..3f4a9f3c 100644 --- a/src/app/services/cadastral-authority/cadastral-authority.service.ts +++ b/src/app/services/cadastral-authority/cadastral-authority.service.ts @@ -67,7 +67,8 @@ export class CadastralAuthorityService { '/workspaces/v2/workspaces/' + workspaceId + '/download-support-manager/' + - managerCode + managerCode, + { responseType: 'arraybuffer', observe: 'response' } ); } /** From 3c19663989a06a04b38ae30348404c486e06cbf6 Mon Sep 17 00:00:00 2001 From: MauricioAcosta Date: Mon, 22 Feb 2021 20:34:40 -0500 Subject: [PATCH 14/54] :success: finish edit information workspace all managers --- .../operator-assignment.component.html | 33 +++++------- .../operator-assignment.component.ts | 53 ++++++++----------- 2 files changed, 33 insertions(+), 53 deletions(-) diff --git a/src/app/layout/sections/municipality-management/operator-assignment/operator-assignment.component.html b/src/app/layout/sections/municipality-management/operator-assignment/operator-assignment.component.html index cd86ef83..70e998c4 100644 --- a/src/app/layout/sections/municipality-management/operator-assignment/operator-assignment.component.html +++ b/src/app/layout/sections/municipality-management/operator-assignment/operator-assignment.component.html @@ -38,18 +38,6 @@ home Información Básica     -

  • -
    - -
    -
    {{ formatDate(dataWorkSpace.createdAt) }}
    +
    +
    + +
    +
    + {{ formatDate(dataWorkSpace.createdAt) }}
    @@ -124,7 +116,7 @@ type="date" name="startDate" [(ngModel)]="item.startDate" - disabled="{{ editForm[index].startDate }}" + disabled="{{ !editForm[index]?.startDate }}" id="startDate{{ index }}" /> @@ -132,17 +124,16 @@
    -
    +

    -
    -
    -
    -
    -
    - -
    - -
    + +
    +

    + ¿Está seguro de modificar los datos del Operador? +

    + +
    +
    +
    + Advertencia: Esta acción actualizará la información del espacio + de trabajo. +
    +
    +
    +
    + +
    +
    +
    -
    -
    -
    -
    - + + +
    +

    ¿Está seguro de asignar el Operador?

    + +
    +
    +
    + Advertencia: Esta acción asignará un operador al espacio de + trabajo. +
    +
    +
    +
    + +
    +
    + +
    +
    +     +
    +
    +

    + {{ idOperator > 0 ? "Actualizar" : "Crear" }} Operador + #{{ idOperator }} +

    +
    +
    + +
    +
    +
    +
    + +
    + +
    -
    -
    -
    -
    -
    - +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + +
    + +
    -
    -
    -
    -
    -
    -
    -
    - +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + +
    + +
    -
    -
    -
    -
    -
    - +
    +
    +
    +
    +
    * Alcance / Observaciones
    +
    + +
    -
    -
    -
    -
    -
    -
    -
    -
    * Alcance / Observaciones
    +
    +
    +
    +
    + +
    + +
    -
    -
    -
    -
    -
    -
    -
    - +
    +
    +
    -
    -
    +
    -
    -
    - +
    + + +
    +
    +
    +
    +

    Listado de operadores

    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    IDOperadorFecha de inicioFecha finalNúmero de prediosÁrea de trabajoAlcance/ObservacionesSoporteOpciones
    {{ item.operator.id }}{{ item.operator.alias }}{{ formatDate(item.createdAt) }}{{ formatDate(item.endDate) }}{{ item.numberParcelsExpected }}{{ item.workArea }} + + + + preview + + + + edit + +
    - -
    - -
    @@ -443,46 +619,4 @@
    - -
    -

    - ¿Está seguro de modificar los datos del Operador? -

    - -
    -
    -
    - Advertencia: Esta acción actualizará la información del espacio de - trabajo. -
    -
    -
    -
    - -
    -
    - -
    -
    -
    diff --git a/src/app/layout/sections/municipality-management/operator-assignment/operator-assignment.component.ts b/src/app/layout/sections/municipality-management/operator-assignment/operator-assignment.component.ts index 5040bbb6..f14d0336 100644 --- a/src/app/layout/sections/municipality-management/operator-assignment/operator-assignment.component.ts +++ b/src/app/layout/sections/municipality-management/operator-assignment/operator-assignment.component.ts @@ -9,8 +9,10 @@ import { RoleModel } from 'src/app/helpers/role.model'; import { saveAs } from 'file-saver'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { environment } from 'src/environments/environment'; -import { CadastralAuthorityService } from 'src/app/services/cadastral-authority/cadastral-authority.service'; +import { CadastralAuthorityService } from 'src/app/services/v2/cadastral-authority/cadastral-authority.service'; import { UpdateInformationByWorkspace } from 'src/app/models/updateInformationByWorkspace.interface'; +import { ManagerService } from 'src/app/services/v2/manager/manager.service'; +import { ViewportScroller } from '@angular/common'; const moment = _moment; @Component({ @@ -33,14 +35,14 @@ export class OperatorAssignmentComponent implements OnInit { dataOperatorsWorkSpace: any; supportFileOperator: any; updateInfoBasic: boolean; - replaceOperator: boolean; - @ViewChild('myInput') + @ViewChild('myInputdocSoport') myInputVariable: ElementRef; assingOperator: boolean; suppliesAttachmentsData: any; idWorkSpaceMunicipality: number; isChangeDataOperator: boolean; isActiveAssignOperator: boolean; + idOperator: number; constructor( private router: Router, private activedRoute: ActivatedRoute, @@ -49,7 +51,9 @@ export class OperatorAssignmentComponent implements OnInit { private serviceOperators: OperatorsService, private roles: RoleModel, private modalService: NgbModal, - private cadastralAuthorityService: CadastralAuthorityService + private cadastralAuthorityService: CadastralAuthorityService, + private managerService: ManagerService, + private scroll: ViewportScroller ) { this.dataWorkSpace = { manager: {}, @@ -77,10 +81,10 @@ export class OperatorAssignmentComponent implements OnInit { }; this.updateInfoBasic = false; this.assingOperator = false; - this.replaceOperator = false; this.suppliesAttachmentsData = []; this.isChangeDataOperator = false; this.isActiveAssignOperator = false; + this.idOperator = 0; } ngOnInit() { @@ -120,7 +124,6 @@ export class OperatorAssignmentComponent implements OnInit { .getWorkSpace(this.idWorkspace) .subscribe((response: any) => { this.dataWorkSpace = response; - console.log(this.dataWorkSpace); this.dataWorkSpace.managers.forEach((_) => { this.editForm.push({ startDate: false, @@ -128,24 +131,6 @@ export class OperatorAssignmentComponent implements OnInit { }); }); this.selectDepartment = this.dataWorkSpace.municipality.department.id; - if (this.dataWorkSpace.operators.length > 0) { - this.replaceOperator = true; - this.dataOperatorsWorkSpace = this.clone( - this.dataWorkSpace.operators[0] - ); - const startDate = this.dataWorkSpace.operators[0].startDate.split( - 'T' - )[0]; - const endDate = this.dataWorkSpace.operators[0].endDate.split( - 'T' - )[0]; - this.dataOperatorsWorkSpace.startDate = this.formatDateOperator( - startDate - ); - this.dataOperatorsWorkSpace.endDate = this.formatDateOperator( - endDate - ); - } }); if (this.tab === 3) { this.serviceOperators.getOperatorsByFilters().subscribe((response) => { @@ -211,24 +196,6 @@ export class OperatorAssignmentComponent implements OnInit { .getWorkSpace(this.idWorkspace) .subscribe((response: any) => { this.dataWorkSpace = response; - if (this.dataWorkSpace.operators.length > 0) { - this.replaceOperator = true; - this.dataOperatorsWorkSpace = this.clone( - this.dataWorkSpace.operators[0] - ); - const startDate = this.dataWorkSpace.operators[0].startDate.split( - 'T' - )[0]; - const endDate = this.dataWorkSpace.operators[0].endDate.split( - 'T' - )[0]; - this.dataOperatorsWorkSpace.startDate = this.formatDateOperator( - startDate - ); - this.dataOperatorsWorkSpace.endDate = this.formatDateOperator( - endDate - ); - } }); if (this.tab === 3) { this.serviceOperators.getOperatorsByFilters().subscribe((response) => { @@ -378,47 +345,92 @@ export class OperatorAssignmentComponent implements OnInit { } else if (this.dataOperatorsWorkSpace.workArea < 0) { this.toastr.error('El área de trabajo no es correcta.'); } else { - this.serviceWorkspaces - .assingOperatorToWorkSpace(this.idWorkspace, dataOperator) - .subscribe((_) => { + this.managerService + .assignOperatorToMunicipality(this.idWorkspace, dataOperator) + .subscribe((element) => { + this.dataWorkSpace = element; this.toastr.success('Operador asignado satisfactoriamente'); + this.supportFileOperator = undefined; this.isChangeDataOperator = false; - this.serviceWorkspaces - .getWorkSpaceActiveByMunicipality(this.selectMunicipality) - .subscribe((data: any) => { - this.idWorkspace = data.id; - this.serviceWorkspaces - .getWorkSpace(this.idWorkspace) - .subscribe((response) => { - this.dataWorkSpace = response; - if (this.dataWorkSpace.operators.length > 0) { - this.replaceOperator = true; - this.dataOperatorsWorkSpace = this.clone( - this.dataWorkSpace.operators[0] - ); - const startDate = this.dataWorkSpace.operators[0].startDate.split( - 'T' - )[0]; - const endDate = this.dataWorkSpace.operators[0].endDate.split( - 'T' - )[0]; - this.dataOperatorsWorkSpace.startDate = this.formatDateOperator( - startDate - ); - this.dataOperatorsWorkSpace.endDate = this.formatDateOperator( - endDate - ); - } - }); - }); + this.dataOperatorsWorkSpace = { + startDate: '', + endDate: '', + numberParcelsExpected: 0, + workArea: 0, + observations: '', + operatorCode: 0, + }; + this.myInputVariable.nativeElement.value = ''; + this.isActiveAssignOperator = false; }); } } - closeModal(option: boolean) { - if (option) { - this.assingOperatorInWorkSpace(); + updateOperatorInWorkSpace() { + const dataOperator = new FormData(); + dataOperator.append('supportFile', this.supportFileOperator); + dataOperator.append('startDate', this.dataOperatorsWorkSpace.startDate); + dataOperator.append('endDate', this.dataOperatorsWorkSpace.endDate); + dataOperator.append( + 'numberParcelsExpected', + this.dataOperatorsWorkSpace.numberParcelsExpected + ); + dataOperator.append( + 'operatorCode', + this.dataOperatorsWorkSpace.operatorCode + ); + dataOperator.append('workArea', this.dataOperatorsWorkSpace.workArea); + dataOperator.append( + 'observations', + this.dataOperatorsWorkSpace.observations + ); + const numberAlphanumericParcels = Number.isInteger( + this.dataOperatorsWorkSpace.numberParcelsExpected + ); + const workArea = Number.isInteger(this.dataOperatorsWorkSpace.workArea); + if (this.supportFileOperator === undefined) { + this.toastr.error('No se ha cargado ningún soporte.'); + } else if (this.dataOperatorsWorkSpace.observations === '') { + this.toastr.error('Las observaciones son obligatorias.'); + } else if (!numberAlphanumericParcels) { + this.toastr.error( + 'El número de predios a intervenir debe ser de tipo numérico.' + ); + } else if (this.dataOperatorsWorkSpace.numberParcelsExpected < 0) { + this.toastr.error('El número de predios no es correcto.'); + } else if (!workArea) { + this.toastr.error('El área de trabajo debe ser de tipo numérico.'); + } else if (this.dataOperatorsWorkSpace.workArea < 0) { + this.toastr.error('El área de trabajo no es correcta.'); + } else { + this.managerService + .updateOperatorInformationFromWorkspace( + this.idWorkspace, + this.dataOperatorsWorkSpace.operatorCode, + dataOperator + ) + .subscribe((_) => { + this.toastr.success('Operador Actualizado satisfactoriamente'); + this.supportFileOperator = undefined; + this.dataOperatorsWorkSpace = { + startDate: '', + endDate: '', + numberParcelsExpected: 0, + workArea: 0, + observations: '', + operatorCode: 0, + }; + this.myInputVariable.nativeElement.value = ''; + this.idOperator = 0; + this.isActiveAssignOperator = false; + this.isChangeDataOperator = false; + }); } + } + closeModalUpdateOperator(option: boolean) { this.modalService.dismissAll(); + if (option) { + this.updateOperatorInWorkSpace(); + } } openModal(modal: any) { this.modalService.open(modal, { centered: true, scrollable: true }); @@ -481,7 +493,6 @@ export class OperatorAssignmentComponent implements OnInit { }); } changeDataOperator() { - this.isChangeDataOperator = false; this.isActiveAssignOperator = false; if ( this.dataOperatorsWorkSpace.startDate !== '' && @@ -492,7 +503,6 @@ export class OperatorAssignmentComponent implements OnInit { this.dataOperatorsWorkSpace.operatorCode !== 0 ) { this.isActiveAssignOperator = true; - this.isChangeDataOperator = true; } } downloadSuppliesAutoridad(idSupplie: number, nameSupplie: string) { @@ -505,4 +515,40 @@ export class OperatorAssignmentComponent implements OnInit { saveAs(blob, nameSupplie + '.zip'); }); } + openModalCreateOperator(modal: any) { + this.modalService.open(modal, { centered: true, scrollable: true }); + } + closeModalCreateOperator(option: boolean) { + this.modalService.dismissAll(); + if (option) { + this.assingOperatorInWorkSpace(); + } + } + previewSupportOperator(operatorCode: number, index: number) { + this.managerService + .downloadOperatorSupport(this.idWorkspace, operatorCode) + .subscribe((data: any) => { + const contentType = data.headers.get('content-type'); + const type = contentType.split(',')[0]; + const dataFile = data.body; + const blob = new Blob([dataFile], { type }); + const url = window.URL.createObjectURL(blob); + const preview = window.open(url, 'soporte'); + setTimeout(() => { + preview.document.title = + 'Soporte Operador ' + + this.dataWorkSpace.operators[index].operator.alias; + }, 500); + }); + } + updateOperator(item: any) { + this.dataOperatorsWorkSpace = item; + const startDate = this.dataWorkSpace.operators[0].startDate.split('T')[0]; + const endDate = this.dataWorkSpace.operators[0].endDate.split('T')[0]; + this.dataOperatorsWorkSpace.startDate = this.formatDateOperator(startDate); + this.dataOperatorsWorkSpace.endDate = this.formatDateOperator(endDate); + this.isChangeDataOperator = true; + this.idOperator = item.id; + this.scroll.scrollToAnchor('actionFormOperator'); + } } diff --git a/src/app/layout/sections/municipality-management/supplies-delivery/supplies-delivery.component.ts b/src/app/layout/sections/municipality-management/supplies-delivery/supplies-delivery.component.ts index 3bff7b13..7ef0ddbe 100644 --- a/src/app/layout/sections/municipality-management/supplies-delivery/supplies-delivery.component.ts +++ b/src/app/layout/sections/municipality-management/supplies-delivery/supplies-delivery.component.ts @@ -90,8 +90,6 @@ export class SuppliesDeliveryComponent implements OnInit { if (response.length > 0) { this.isActive = true; this.idWorkspace = response[0].id; - console.log('getWorkSpaceByMunicipality: ', response); - this.search(); this.isSearch = true; } else { @@ -238,8 +236,6 @@ export class SuppliesDeliveryComponent implements OnInit { this.modalService.open(modal, { centered: true, scrollable: true }); } deleteSupplies(idSupplie: number, index?: number) { - console.log('this.idWorkspace: ', this.idWorkspace); - this.serviceWorkspaces .deleteSupplies(this.idWorkspace, idSupplie) .subscribe((_) => { diff --git a/src/app/layout/sections/municipality-management/workspace-refuse/workspace-refuse.component.ts b/src/app/layout/sections/municipality-management/workspace-refuse/workspace-refuse.component.ts index 9eee92a5..7533647a 100644 --- a/src/app/layout/sections/municipality-management/workspace-refuse/workspace-refuse.component.ts +++ b/src/app/layout/sections/municipality-management/workspace-refuse/workspace-refuse.component.ts @@ -3,7 +3,7 @@ import { Router } from '@angular/router'; import { ToastrService } from 'ngx-toastr'; import { JwtHelper } from 'src/app/helpers/jwt'; import { RoleModel } from 'src/app/helpers/role.model'; -import { CadastralAuthorityService } from 'src/app/services/cadastral-authority/cadastral-authority.service'; +import { CadastralAuthorityService } from 'src/app/services/v2/cadastral-authority/cadastral-authority.service'; import { ManagersService } from 'src/app/services/managers/managers.service'; import { WorkspacesService } from 'src/app/services/workspaces/workspaces.service'; diff --git a/src/app/login/login.component.ts b/src/app/login/login.component.ts index bf9ffa6f..09305d41 100644 --- a/src/app/login/login.component.ts +++ b/src/app/login/login.component.ts @@ -57,7 +57,6 @@ export class LoginComponent implements OnInit { this.serviceAUTH .recoverPassword(this.emailByRecover) .subscribe((response: any) => { - console.log(response); this.toast.success(response.message); this.modalService.dismissAll(); this.modalService.open(modal, { centered: true, scrollable: true }); @@ -89,7 +88,6 @@ export class LoginComponent implements OnInit { this.serviceAUTH .ResetPassword(this.emailByRecover, this.codeRecover, this.newPassword) .subscribe((response: any) => { - console.log(response); this.toast.success(response.message); this.modalService.dismissAll(); }); diff --git a/src/app/services/cadastral-authority/cadastral-authority.service.spec.ts b/src/app/services/v2/cadastral-authority/cadastral-authority.service.spec.ts similarity index 100% rename from src/app/services/cadastral-authority/cadastral-authority.service.spec.ts rename to src/app/services/v2/cadastral-authority/cadastral-authority.service.spec.ts diff --git a/src/app/services/cadastral-authority/cadastral-authority.service.ts b/src/app/services/v2/cadastral-authority/cadastral-authority.service.ts similarity index 97% rename from src/app/services/cadastral-authority/cadastral-authority.service.ts rename to src/app/services/v2/cadastral-authority/cadastral-authority.service.ts index 3f4a9f3c..52839abf 100644 --- a/src/app/services/cadastral-authority/cadastral-authority.service.ts +++ b/src/app/services/v2/cadastral-authority/cadastral-authority.service.ts @@ -1,6 +1,6 @@ -import { UpdateInformationByWorkspace } from './../../models/updateInformationByWorkspace.interface'; import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; +import { UpdateInformationByWorkspace } from 'src/app/models/updateInformationByWorkspace.interface'; import { environment } from 'src/environments/environment'; @Injectable({ diff --git a/src/app/services/v2/manager/manager.service.spec.ts b/src/app/services/v2/manager/manager.service.spec.ts new file mode 100644 index 00000000..65db7d69 --- /dev/null +++ b/src/app/services/v2/manager/manager.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { ManagerService } from './manager.service'; + +describe('ManagerService', () => { + let service: ManagerService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(ManagerService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/services/v2/manager/manager.service.ts b/src/app/services/v2/manager/manager.service.ts new file mode 100644 index 00000000..d209dfe0 --- /dev/null +++ b/src/app/services/v2/manager/manager.service.ts @@ -0,0 +1,52 @@ +import { Injectable } from '@angular/core'; +import { environment } from 'src/environments/environment'; +import { HttpClient } from '@angular/common/http'; + +@Injectable({ + providedIn: 'root', +}) +export class ManagerService { + url: string; + constructor(private httpClient: HttpClient) { + this.url = environment.apiBaseUrlPrefix; + } + /** + * assignOperatorToMunicipality + */ + public assignOperatorToMunicipality(workspaceId: number, formData: FormData) { + return this.httpClient.post( + this.url + '/workspaces/v1/workspaces/' + workspaceId + '/operators', + formData + ); + } + /** + * updateOperatorInformationFromWorkspace + */ + public updateOperatorInformationFromWorkspace( + workspaceId: number, + operatorCode: number, + formData: FormData + ) { + return this.httpClient.put( + this.url + + '/workspaces/v2/workspaces/' + + workspaceId + + '/operators/' + + operatorCode, + formData + ); + } + /** + * downloadOperatorSupport + */ + public downloadOperatorSupport(workspaceId: number, operatorCode: number) { + return this.httpClient.get( + this.url + + '/workspaces/v2/workspaces/' + + workspaceId + + '/download-support-operator/' + + operatorCode, + { responseType: 'arraybuffer', observe: 'response' } + ); + } +} From 5594eff5bc20f49b82bac25ae265a6c13d42c517 Mon Sep 17 00:00:00 2001 From: MauricioAcosta Date: Tue, 23 Feb 2021 21:48:57 -0500 Subject: [PATCH 16/54] add color edit --- .../assign-workspace/workspace.component.html | 4 +- .../assign-workspace/workspace.component.ts | 5 +- .../operator-assignment.component.html | 48 ++++++++++--------- .../operator-assignment.component.ts | 7 ++- 4 files changed, 37 insertions(+), 27 deletions(-) diff --git a/src/app/layout/sections/municipality-management/assign-workspace/workspace.component.html b/src/app/layout/sections/municipality-management/assign-workspace/workspace.component.html index b05bbd0a..79596a6d 100644 --- a/src/app/layout/sections/municipality-management/assign-workspace/workspace.component.html +++ b/src/app/layout/sections/municipality-management/assign-workspace/workspace.component.html @@ -199,11 +199,11 @@

    Asignación de Gestor Catastral

  • @@ -47,7 +47,7 @@ (click)="getOperator()" aria-controls="messages" > - people Operador people Operadores
  • @@ -67,16 +67,6 @@

    -
    -
    - -
    -
    - {{ formatDate(dataWorkSpace.createdAt) }} -
    -
    @@ -92,6 +82,12 @@ @@ -130,20 +126,19 @@ > + @@ -198,6 +199,146 @@
    Resultados de Búsqueda
    : "Solicitud Abierta" }} +
    {{ item.manager.alias }} -
    - + edit +
    -
    -
    -
    -
    - -
    -
    - {{ dataWorkSpaceMunicipality.manager.name }} -
    -
    -
    -
    -
    -
    - -
    -
    - {{ - dataWorkSpaceMunicipality.operators[0] - ? dataWorkSpaceMunicipality.operators[0].operator.name - : " " - }} -
    -
    -
    -
    @@ -169,7 +140,7 @@
    Catastro
    placement="bottom" show-delay="500" > - {{ item.typeSupply.name }} v{{ i + 1 }} + {{ item.name }} v{{ i + 1 }} {{ globalFuntionDate(item.createdAt) }} @@ -210,7 +181,7 @@
    Registro
    placement="bottom" show-delay="500" > - {{ item.typeSupply.name }} v{{ i + 1 }} + {{ item.name }} v{{ i + 1 }} {{ globalFuntionDate(item.createdAt) }} @@ -243,13 +214,7 @@
    Registro
    -
    +
    Historial de Integraciones
    diff --git a/src/app/layout/sections/supplies/integration/integracion.component.ts b/src/app/layout/sections/supplies/integration/integracion.component.ts index e46c6d14..dc669600 100644 --- a/src/app/layout/sections/supplies/integration/integracion.component.ts +++ b/src/app/layout/sections/supplies/integration/integracion.component.ts @@ -6,6 +6,7 @@ import { FuntionsGlobalsHelper } from 'src/app/helpers/funtionsGlobals'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { ViewportScroller } from '@angular/common'; import { Router, ActivatedRoute } from '@angular/router'; +import { SuppliesService } from 'src/app/services/supplies/supplies.service'; @Component({ selector: 'app-integracion', @@ -43,13 +44,15 @@ export class IntegracionComponent implements OnInit { idCancel: number; tab: number; SelectIntegrationPossible: any; + municipalityCode: string; constructor( private serviceWorkspaces: WorkspacesService, private toastr: ToastrService, private modalService: NgbModal, private router: Router, private scroll: ViewportScroller, - private activedRoute: ActivatedRoute + private activedRoute: ActivatedRoute, + private suppliesService: SuppliesService ) { this.departments = []; this.munucipalities = []; @@ -123,6 +126,7 @@ export class IntegracionComponent implements OnInit { this.idCancel = 0; this.SelectIntegrationPossible = {}; this.tab = 1; + this.municipalityCode = '0'; } ngOnInit() { @@ -169,9 +173,10 @@ export class IntegracionComponent implements OnInit { changeMunucipality() { this.serviceWorkspaces .getWorkSpaceActiveByMunicipality(this.selectMunicipality) - .subscribe((response) => { + .subscribe((response: any) => { this.dataWorkSpaceMunicipality = response; this.idWorkspace = this.dataWorkSpaceMunicipality.id; + this.municipalityCode = response.municipality.code; this.serviceWorkspaces .GetIntegrationsByWorkspace(this.idWorkspace) .subscribe((resp) => { @@ -181,21 +186,21 @@ export class IntegracionComponent implements OnInit { self.scroll.scrollToAnchor('actionForm'); }, 1000); }); - }); - this.serviceWorkspaces - .GetSuppliesByMunicipalityXTF(this.selectMunicipality) - .subscribe((response) => { - this.municipalityXTF = response; - this.catastro = this.municipalityXTF.filter((item) => { - if (item.typeSupply.providerProfile.id === 1) { - return item; - } - }); - this.registro = this.municipalityXTF.filter((item) => { - if (item.typeSupply.providerProfile.id === 4) { - return item; - } - }); + this.suppliesService + .getSuppliesXTFbyMunicipality(this.municipalityCode) + .subscribe((element) => { + this.municipalityXTF = element; + this.catastro = this.municipalityXTF.filter((item) => { + if (item.typeSupplyCode === 2) { + return item; + } + }); + this.registro = this.municipalityXTF.filter((item) => { + if (item.typeSupplyCode === 12) { + return item; + } + }); + }); }); } integrationSupplies() { @@ -325,8 +330,8 @@ export class IntegracionComponent implements OnInit { roundDecimal(num: any) { return Math.round(num * 100) / 100; } - parcelNumber(number: number) { - return new Intl.NumberFormat().format(number); + parcelNumber(index: number) { + return new Intl.NumberFormat().format(index); } openModalXTF(modal: any) { this.modalService.open(modal, { centered: true, scrollable: true }); diff --git a/src/app/layout/sections/supplies/providers-request/solicitud.component.html b/src/app/layout/sections/supplies/providers-request/solicitud.component.html index 6ec49fe1..b727ce17 100644 --- a/src/app/layout/sections/supplies/providers-request/solicitud.component.html +++ b/src/app/layout/sections/supplies/providers-request/solicitud.component.html @@ -98,32 +98,6 @@

    Solicitud de Insumos

    -
    -
    -
    -
    - -
    -
    - {{ dataWorkSpaceMunicipality.manager.name }} -
    -
    -
    -
    -
    -
    - -
    -
    - {{ - dataWorkSpaceMunicipality.operators[0] - ? dataWorkSpaceMunicipality.operators[0].operator.name - : " " - }} -
    -
    -
    -
    diff --git a/src/app/services/supplies/supplies.service.ts b/src/app/services/supplies/supplies.service.ts index 53165b69..32a8062a 100644 --- a/src/app/services/supplies/supplies.service.ts +++ b/src/app/services/supplies/supplies.service.ts @@ -16,4 +16,12 @@ export class SuppliesService { public GetAttachmentsTypes() { return this.httpClient.get(this.url + '/supplies/v1/attachments-types'); } + /** + * getSuppliesXTFbyMunicipality + */ + public getSuppliesXTFbyMunicipality(municipalityCode: string) { + return this.httpClient.get( + this.url + '/supplies/v2/supplies/xtf/' + municipalityCode + ); + } } From 30564378b6463e33e1c96d248a2d8f31595f5e9e Mon Sep 17 00:00:00 2001 From: MauricioAcosta Date: Fri, 26 Feb 2021 00:23:44 -0500 Subject: [PATCH 19/54] delivery supplies by operator --- .../entregar.component.html | 26 +++++++- .../entregar.component.ts | 60 ++++++++++++++----- 2 files changed, 69 insertions(+), 17 deletions(-) diff --git a/src/app/layout/sections/supplies/make-delivery-manager/entregar.component.html b/src/app/layout/sections/supplies/make-delivery-manager/entregar.component.html index 405a5f31..4ee98a90 100644 --- a/src/app/layout/sections/supplies/make-delivery-manager/entregar.component.html +++ b/src/app/layout/sections/supplies/make-delivery-manager/entregar.component.html @@ -51,6 +51,30 @@

    Entrega de Insumos

    +
    +
    +
    + +
    + +
    +
    @@ -72,7 +96,7 @@

    Entrega de Insumos

    -
    +
    diff --git a/src/app/layout/sections/supplies/make-delivery-manager/entregar.component.ts b/src/app/layout/sections/supplies/make-delivery-manager/entregar.component.ts index 404d50e1..78a7dac5 100644 --- a/src/app/layout/sections/supplies/make-delivery-manager/entregar.component.ts +++ b/src/app/layout/sections/supplies/make-delivery-manager/entregar.component.ts @@ -30,6 +30,8 @@ export class EntregarComponent implements OnInit { enabledButton: boolean; listDelivery: any; firstSearch: boolean; + operators: any; + selectOperatorId: number; constructor( private roles: RoleModel, private serviceWorkspaces: WorkspacesService, @@ -50,12 +52,15 @@ export class EntregarComponent implements OnInit { this.deliverySupplies = { observations: '', supplies: [], + operatorCode: 0, }; this.sendSuppliesFilter = true; this.idWorkSpace = 0; this.enabledButton = true; this.listDelivery = []; this.firstSearch = false; + this.operators = []; + this.selectOperatorId = 0; } ngOnInit() { @@ -78,16 +83,32 @@ export class EntregarComponent implements OnInit { .GetMunicipalitiesByDeparment(Number(this.selectDepartment)) .subscribe((data) => { this.munucipalities = data; + this.changeSelects(); }); } changeMunucipality() { - this.sendSuppliesFilter = false; this.serviceWorkspaces .getWorkSpaceActiveByMunicipality(this.selectMunicipality) .subscribe((response: any) => { this.idWorkSpace = response.id; + this.changeSelects(); + this.serviceWorkspaces + .getOnlyOperatorAssignByWorkspace(this.idWorkSpace) + .subscribe((element: any) => { + this.operators = element; + }); }); } + changeSelects() { + this.sendSuppliesFilter = true; + if ( + this.selectDepartment !== 0 && + this.selectMunicipality !== 0 && + this.selectOperatorId !== 0 + ) { + this.sendSuppliesFilter = false; + } + } getPage(page: number) { this.firstSearch = true; this.serviceWorkspaces @@ -201,34 +222,41 @@ export class EntregarComponent implements OnInit { } } sendSupplies() { + this.deliverySupplies.operatorCode = this.selectOperatorId; if (this.deliverySupplies.supplies.length > 0) { if (this.deliverySupplies.observations.length > 0) { const data = this.deliverySupplies.supplies.find((element) => { return element.observations === ''; }); if (data) { - this.toastr.error('Te faltan algunas observaciones'); + this.toastr.error('Le faltan algunas observaciones'); } else { - this.serviceWorkspaces - .deliveriesSupplies(this.idWorkSpace, this.deliverySupplies) - .subscribe((_) => { - this.toastr.success( - 'Se ha realizado la entrega de los insumos al operador' - ); - this.getPage(1); - this.deliverySupplies = { - observations: '', - supplies: [], - }; - this.enabledButton = true; - }); + if (this.deliverySupplies.operatorCode === 0) { + this.toastr.error('No ha seleccionado ningún operador'); + } else { + console.log(this.deliverySupplies); + + this.serviceWorkspaces + .deliveriesSupplies(this.idWorkSpace, this.deliverySupplies) + .subscribe((_) => { + this.toastr.success( + 'Se ha realizado la entrega de los insumos al operador' + ); + this.getPage(1); + this.deliverySupplies = { + observations: '', + supplies: [], + }; + this.enabledButton = true; + }); + } } } else { this.toastr.error('Las observaciones generales son obligatorias'); } } else { this.toastr.error( - 'No has seleccionado ningún insumo, ó te faltan las observaciones' + 'No ha seleccionado ningún insumo, ó te faltan las observaciones' ); } } From 4b55ab751c6d7a2a05ad7fd399747cebaa3977e8 Mon Sep 17 00:00:00 2001 From: MauricioAcosta Date: Tue, 2 Mar 2021 11:40:06 -0500 Subject: [PATCH 20/54] delete log --- .../supplies/make-delivery-manager/entregar.component.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/app/layout/sections/supplies/make-delivery-manager/entregar.component.ts b/src/app/layout/sections/supplies/make-delivery-manager/entregar.component.ts index 78a7dac5..a08bdaf9 100644 --- a/src/app/layout/sections/supplies/make-delivery-manager/entregar.component.ts +++ b/src/app/layout/sections/supplies/make-delivery-manager/entregar.component.ts @@ -234,8 +234,6 @@ export class EntregarComponent implements OnInit { if (this.deliverySupplies.operatorCode === 0) { this.toastr.error('No ha seleccionado ningún operador'); } else { - console.log(this.deliverySupplies); - this.serviceWorkspaces .deliveriesSupplies(this.idWorkSpace, this.deliverySupplies) .subscribe((_) => { From 9456b200161663b953ca4e65d08e54cb2e367486 Mon Sep 17 00:00:00 2001 From: MauricioAcosta Date: Thu, 11 Mar 2021 00:03:48 -0500 Subject: [PATCH 21/54] add view detail --- .../buscar-solicitud.component.html | 433 ++++++++++++++++++ .../buscar-solicitud.component.ts | 14 +- 2 files changed, 446 insertions(+), 1 deletion(-) diff --git a/src/app/layout/sections/supplies/search-request/buscar-solicitud.component.html b/src/app/layout/sections/supplies/search-request/buscar-solicitud.component.html index db8b1d8b..9db36b1a 100644 --- a/src/app/layout/sections/supplies/search-request/buscar-solicitud.component.html +++ b/src/app/layout/sections/supplies/search-request/buscar-solicitud.component.html @@ -163,6 +163,7 @@
    Resultados de Búsqueda
    		Fecha limite Fecha de Cargue EstadoOpciones
    + + + pageview + + + +
    +

    Solicitud

    + +
    +
    +
    + + + + + + + + + + + + + + + + + + + +
    ProveedorFecha de solicitudFecha limiteFecha de cargueEstado
    + {{ + item.provider + ? item.provider.name + : "N/A" + }} + + {{ + globalFuntionDate(item.createdAt) + }} + + {{ globalFuntionDate(item.deadline) }} + + {{ + item.closedAt + ? globalFuntionDate(item.closedAt) + : "N/A" + }} + + {{ + item.closedAt + ? "Solicitud Cerrada" + : "Solicitud Abierta" + }} +
    +
    +
    + + + + + + + + + + + + + + + +
    InsumoEstadoObservación/Justificación
    + {{ supp.typeSupply.name }} + + {{ supp.state.name }} + + + + +
    +
    +
    +     +
    @@ -298,6 +439,7 @@
    Resultados de Búsqueda
    Fecha límite Fecha de Cargue Estado + Opciones @@ -338,6 +480,148 @@
    Resultados de Búsqueda
    : "Solicitud Abierta" }} + + + + pageview + + + +
    +

    Solicitud

    + +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + +
    DepartamentoMunicipioFecha de solicitudFecha limiteFecha de cargueEstado
    + {{ + item.municipality.department.name + }} + + {{ item.municipality.name }} + + {{ + globalFuntionDate(item.createdAt) + }} + + {{ globalFuntionDate(item.deadline) }} + + {{ + item.closedAt + ? globalFuntionDate(item.closedAt) + : "N/A" + }} + + {{ + item.closedAt + ? "Solicitud Cerrada" + : "Solicitud Abierta" + }} +
    +
    +
    + + + + + + + + + + + + + + + +
    InsumoEstadoObservación/Justificación
    + {{ supp.typeSupply.name }} + + {{ supp.state.name }} + + + + +
    +
    +
    +     + @@ -434,6 +718,7 @@
    Resultados de Búsqueda
    Estado + Opciones @@ -486,6 +771,154 @@
    Resultados de Búsqueda
    : "Solicitud Abierta" }} + + + + pageview + + + +
    +

    Solicitud

    + +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + +
    Número de ordenDepartamentoMunicipioProveedorFecha de solicitudFecha limiteFecha de cargueEstado
    + {{ item.packageLabel }} + + {{ + item.municipality.department.name + }} + + {{ item.municipality.name }} + + {{ item.provider.name }} + + {{ + globalFuntionDate(item.createdAt) + }} + + {{ globalFuntionDate(item.deadline) }} + + {{ + item.closedAt + ? globalFuntionDate(item.closedAt) + : "N/A" + }} + + {{ + item.closedAt + ? "Solicitud Cerrada" + : "Solicitud Abierta" + }} +
    +
    +
    + + + + + + + + + + + + + + + +
    InsumoEstadoObservación/Justificación
    + {{ supp.typeSupply.name }} + + {{ supp.state.name }} + + + + +
    +
    +
    +     + diff --git a/src/app/layout/sections/supplies/search-request/buscar-solicitud.component.ts b/src/app/layout/sections/supplies/search-request/buscar-solicitud.component.ts index cb8018ec..df8ed932 100644 --- a/src/app/layout/sections/supplies/search-request/buscar-solicitud.component.ts +++ b/src/app/layout/sections/supplies/search-request/buscar-solicitud.component.ts @@ -4,6 +4,7 @@ import { WorkspacesService } from 'src/app/services/workspaces/workspaces.servic import { ProvidersService } from 'src/app/services/providers/providers.service'; import { ActivatedRoute, Router } from '@angular/router'; import { JwtHelper } from 'src/app/helpers/jwt'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; @Component({ selector: 'app-buscar-solicitud', @@ -40,7 +41,8 @@ export class BuscarSolicitudComponent implements OnInit { private serviceWorkspaces: WorkspacesService, private serviceProvider: ProvidersService, private router: Router, - private activedRoute: ActivatedRoute + private activedRoute: ActivatedRoute, + private modalService: NgbModal ) { this.usermanager = false; this.departments = []; @@ -125,6 +127,7 @@ export class BuscarSolicitudComponent implements OnInit { this.size = response.size; this.totalElements = response.totalElements; this.allSupplies = response.items; + console.log('this.allSupplies: ', this.allSupplies); }); } getPageProvider(page: string) { @@ -135,6 +138,7 @@ export class BuscarSolicitudComponent implements OnInit { this.size = response.size; this.totalElements = response.totalElements; this.infoTabProvider = response.items; + console.log('this.infoTabProvider: ', this.infoTabProvider); }); } getPageOrder() { @@ -144,6 +148,7 @@ export class BuscarSolicitudComponent implements OnInit { this.infoTabOrder = response; this.search3 = true; this.totalElements = this.infoTabOrder.length; + console.log('this.infoTabOrder: ', this.infoTabOrder); }); } activebuttontab1() { @@ -168,4 +173,11 @@ export class BuscarSolicitudComponent implements OnInit { this.search3 = false; } } + openModalViewDetail(modal: any) { + this.modalService.open(modal, { + centered: true, + scrollable: true, + size: 'lg', + }); + } } From 88d6853959b8c2060f554dba0e1dfed82fc4a9c2 Mon Sep 17 00:00:00 2001 From: MauricioAcosta Date: Thu, 11 Mar 2021 00:04:33 -0500 Subject: [PATCH 22/54] remove log --- .../supplies/search-request/buscar-solicitud.component.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/app/layout/sections/supplies/search-request/buscar-solicitud.component.ts b/src/app/layout/sections/supplies/search-request/buscar-solicitud.component.ts index df8ed932..14c6ee99 100644 --- a/src/app/layout/sections/supplies/search-request/buscar-solicitud.component.ts +++ b/src/app/layout/sections/supplies/search-request/buscar-solicitud.component.ts @@ -127,7 +127,6 @@ export class BuscarSolicitudComponent implements OnInit { this.size = response.size; this.totalElements = response.totalElements; this.allSupplies = response.items; - console.log('this.allSupplies: ', this.allSupplies); }); } getPageProvider(page: string) { @@ -138,7 +137,6 @@ export class BuscarSolicitudComponent implements OnInit { this.size = response.size; this.totalElements = response.totalElements; this.infoTabProvider = response.items; - console.log('this.infoTabProvider: ', this.infoTabProvider); }); } getPageOrder() { @@ -148,7 +146,6 @@ export class BuscarSolicitudComponent implements OnInit { this.infoTabOrder = response; this.search3 = true; this.totalElements = this.infoTabOrder.length; - console.log('this.infoTabOrder: ', this.infoTabOrder); }); } activebuttontab1() { From 6f23b2d45b600e071374978c8bed59a3186ee595 Mon Sep 17 00:00:00 2001 From: MauricioAcosta Date: Tue, 23 Mar 2021 11:09:12 -0500 Subject: [PATCH 23/54] change services by cadastral information --- .../assign-workspace/workspace.component.html | 4 ++-- .../operator-assignment.component.html | 2 +- .../supplies-delivery.component.ts | 7 ++++--- .../services/workspaces/workspaces.service.ts | 19 ++++++++++++++++--- 4 files changed, 23 insertions(+), 9 deletions(-) diff --git a/src/app/layout/sections/municipality-management/assign-workspace/workspace.component.html b/src/app/layout/sections/municipality-management/assign-workspace/workspace.component.html index 79596a6d..e9d869fb 100644 --- a/src/app/layout/sections/municipality-management/assign-workspace/workspace.component.html +++ b/src/app/layout/sections/municipality-management/assign-workspace/workspace.component.html @@ -1,6 +1,6 @@
    @@ -232,7 +232,7 @@

    - Advertencia: Esta acción asignará espacio(s) de trabajo ha + Advertencia: Esta acción asignará espacio(s) de trabajo a {{ dataCreateWorkSpace.municipalityId.length }} municipio(s) seleccionado(s).
    diff --git a/src/app/layout/sections/municipality-management/operator-assignment/operator-assignment.component.html b/src/app/layout/sections/municipality-management/operator-assignment/operator-assignment.component.html index 08790327..de13e70e 100644 --- a/src/app/layout/sections/municipality-management/operator-assignment/operator-assignment.component.html +++ b/src/app/layout/sections/municipality-management/operator-assignment/operator-assignment.component.html @@ -23,7 +23,7 @@
    -
    Espacio de Trabajo
    +
    Gestión de Municipio
    • diff --git a/src/app/layout/sections/municipality-management/supplies-delivery/supplies-delivery.component.ts b/src/app/layout/sections/municipality-management/supplies-delivery/supplies-delivery.component.ts index 7ef0ddbe..4f6d1af9 100644 --- a/src/app/layout/sections/municipality-management/supplies-delivery/supplies-delivery.component.ts +++ b/src/app/layout/sections/municipality-management/supplies-delivery/supplies-delivery.component.ts @@ -114,7 +114,7 @@ export class SuppliesDeliveryComponent implements OnInit { this.dataAttachmentsTypes = data; }); this.serviceWorkspaces - .getSuppliesAttachments(this.selectMunicipality) + .getSuppliesAttachments(this.selectMunicipality, this.selectManager) .subscribe((response) => { this.suppliesAttachmentsData = response; this.suppliesAttachmentsData = this.suppliesAttachmentsData.filter( @@ -195,13 +195,14 @@ export class SuppliesDeliveryComponent implements OnInit { } form.append('name', this.nameAttachmentsTypes); form.append('observations', this.observationsAttachmentsTypes); + form.append('managerCode', this.selectManager.toString()); this.serviceWorkspaces .createAttachmentsSupply(this.selectMunicipality, form) .subscribe((_) => { this.toastr.success('Ha agregado correctamente el registro.'); this.validInputAttachmentsTypes = false; this.serviceWorkspaces - .getSuppliesAttachments(this.selectMunicipality) + .getSuppliesAttachments(this.selectMunicipality, this.selectManager) .subscribe((response) => { this.suppliesAttachmentsData = response; this.selectAttachments = 0; @@ -251,7 +252,7 @@ export class SuppliesDeliveryComponent implements OnInit { } downloadGetReportAuthority() { this.serviceWorkspaces - .getReportAuthority(this.selectMunicipality) + .getReportAuthority(this.selectMunicipality, this.selectManager) .subscribe((data: any) => { const contentType = data.headers.get('content-type'); const type = contentType.split(',')[0]; diff --git a/src/app/services/workspaces/workspaces.service.ts b/src/app/services/workspaces/workspaces.service.ts index f99acfd1..6a980955 100644 --- a/src/app/services/workspaces/workspaces.service.ts +++ b/src/app/services/workspaces/workspaces.service.ts @@ -704,7 +704,16 @@ export class WorkspacesService { /** * getSuppliesAttachments */ - public getSuppliesAttachments(municipalityId: number) { + public getSuppliesAttachments(municipalityId: number, managerId?: number) { + if (managerId) { + return this.httpClient.get( + this.url + + '/workspaces/v1/supplies/' + + municipalityId + + '?active=false&manager=' + + managerId + ); + } return this.httpClient.get( this.url + '/workspaces/v1/supplies/' + municipalityId + '?active=false' ); @@ -736,9 +745,13 @@ export class WorkspacesService { /** * getReportAuthority */ - public getReportAuthority(municipalityId: number) { + public getReportAuthority(municipalityId: number, managerId: number) { return this.httpClient.get( - this.url + '/workspaces/v1/cadastral-authority/report/' + municipalityId, + this.url + + '/workspaces/v1/cadastral-authority/report/' + + municipalityId + + '?manager=' + + managerId, { responseType: 'arraybuffer', observe: 'response' } ); } From a20e99b021145dd1ae7cc7015a6d703196bc2e75 Mon Sep 17 00:00:00 2001 From: MauricioAcosta Date: Wed, 24 Mar 2021 09:19:35 -0500 Subject: [PATCH 24/54] change text and sort list --- .../list-user/list-user.component.html | 2 +- .../manager/gestor.component.html | 2 +- .../operator/operador.component.html | 2 +- .../provider/proveedor.component.html | 2 +- .../assign-workspace/workspace.component.html | 4 +- .../assign-workspace/workspace.component.ts | 2 +- .../operator-assignment.component.html | 17 +++++-- .../operator-assignment.component.ts | 11 ++++ .../search-workspace.component.html | 2 +- .../supplies-delivery.component.html | 4 +- .../workspace-active.component.html | 4 +- .../workspace-active.component.ts | 14 ++++-- .../workspace-refuse.component.html | 50 +++++++++++++++++-- .../workspace-refuse.component.ts | 15 +++++- .../peticiones-proveedor.component.html | 8 +-- .../buscar-solicitud.component.html | 5 +- 16 files changed, 112 insertions(+), 32 deletions(-) diff --git a/src/app/layout/sections/administrator/list-user/list-user.component.html b/src/app/layout/sections/administrator/list-user/list-user.component.html index 507941bf..f00f09e8 100644 --- a/src/app/layout/sections/administrator/list-user/list-user.component.html +++ b/src/app/layout/sections/administrator/list-user/list-user.component.html @@ -1,5 +1,5 @@
      - +
      diff --git a/src/app/layout/sections/administrator/manager/gestor.component.html b/src/app/layout/sections/administrator/manager/gestor.component.html index 63dd770a..90723ab1 100644 --- a/src/app/layout/sections/administrator/manager/gestor.component.html +++ b/src/app/layout/sections/administrator/manager/gestor.component.html @@ -1,5 +1,5 @@
      - +
      diff --git a/src/app/layout/sections/administrator/operator/operador.component.html b/src/app/layout/sections/administrator/operator/operador.component.html index d3fa22ef..6bfb0a3c 100644 --- a/src/app/layout/sections/administrator/operator/operador.component.html +++ b/src/app/layout/sections/administrator/operator/operador.component.html @@ -1,5 +1,5 @@
      - +
      diff --git a/src/app/layout/sections/administrator/provider/proveedor.component.html b/src/app/layout/sections/administrator/provider/proveedor.component.html index bd0c691d..ad329354 100644 --- a/src/app/layout/sections/administrator/provider/proveedor.component.html +++ b/src/app/layout/sections/administrator/provider/proveedor.component.html @@ -1,5 +1,5 @@
      - +
      diff --git a/src/app/layout/sections/municipality-management/assign-workspace/workspace.component.html b/src/app/layout/sections/municipality-management/assign-workspace/workspace.component.html index e9d869fb..c903809a 100644 --- a/src/app/layout/sections/municipality-management/assign-workspace/workspace.component.html +++ b/src/app/layout/sections/municipality-management/assign-workspace/workspace.component.html @@ -219,7 +219,7 @@

      Asignación de Gestor Catastral

      - ¿Está seguro de crear el espacio de trabajo para el(los) Municipio(s)? + ¿Está seguro de asignar el(los) Municipio(s) a este gestor?

      - Advertencia: Esta acción asignará espacio(s) de trabajo a + Advertencia: Esta acción asignará este gestor a {{ dataCreateWorkSpace.municipalityId.length }} municipio(s) seleccionado(s).
      diff --git a/src/app/layout/sections/municipality-management/assign-workspace/workspace.component.ts b/src/app/layout/sections/municipality-management/assign-workspace/workspace.component.ts index 8e09bafe..78b0831e 100644 --- a/src/app/layout/sections/municipality-management/assign-workspace/workspace.component.ts +++ b/src/app/layout/sections/municipality-management/assign-workspace/workspace.component.ts @@ -165,7 +165,7 @@ export class WorkspaceComponent implements OnInit { } this.cadastralAuthorityService.assignManager(formdata).subscribe((_) => { this.toastr.success( - 'Se ha asignado el(los) espacio(s) de trabajo para el(los) municipio(s) seleccionado(s).' + 'Se ha asignado el(los) gestor(es) para el(los) municipio(s) seleccionado(s).' ); this.dataCreateWorkSpace = { selectDepartment: '0', diff --git a/src/app/layout/sections/municipality-management/operator-assignment/operator-assignment.component.html b/src/app/layout/sections/municipality-management/operator-assignment/operator-assignment.component.html index de13e70e..0cb44da9 100644 --- a/src/app/layout/sections/municipality-management/operator-assignment/operator-assignment.component.html +++ b/src/app/layout/sections/municipality-management/operator-assignment/operator-assignment.component.html @@ -163,7 +163,7 @@

      Advertencia: Esta acción actualizará la información del - espacio de trabajo. + municipio.
      @@ -216,8 +216,8 @@

      - Advertencia: Esta acción actualizará la información del espacio - de trabajo. + Advertencia: Esta acción actualizará la información del + municipio.
      @@ -256,8 +256,7 @@

      ¿Está seguro de asignar el Operador?

      - Advertencia: Esta acción asignará un operador al espacio de - trabajo. + Advertencia: Esta acción asignará un operador al municipio.
      @@ -460,6 +459,14 @@

      > Actualizar operador +

      diff --git a/src/app/layout/sections/municipality-management/operator-assignment/operator-assignment.component.ts b/src/app/layout/sections/municipality-management/operator-assignment/operator-assignment.component.ts index 44092c45..cb500217 100644 --- a/src/app/layout/sections/municipality-management/operator-assignment/operator-assignment.component.ts +++ b/src/app/layout/sections/municipality-management/operator-assignment/operator-assignment.component.ts @@ -567,4 +567,15 @@ export class OperatorAssignmentComponent implements OnInit { this.idOperator = item.id; this.scroll.scrollToAnchor('actionFormOperator'); } + cancel() { + this.idOperator = 0; + this.dataOperatorsWorkSpace = { + startDate: '', + endDate: '', + numberParcelsExpected: 0, + workArea: 0, + observations: '', + operatorCode: 0, + }; + } } diff --git a/src/app/layout/sections/municipality-management/search-workspace/search-workspace.component.html b/src/app/layout/sections/municipality-management/search-workspace/search-workspace.component.html index 7f5a5ad4..c41be3ac 100644 --- a/src/app/layout/sections/municipality-management/search-workspace/search-workspace.component.html +++ b/src/app/layout/sections/municipality-management/search-workspace/search-workspace.component.html @@ -1,6 +1,6 @@
      diff --git a/src/app/layout/sections/municipality-management/supplies-delivery/supplies-delivery.component.html b/src/app/layout/sections/municipality-management/supplies-delivery/supplies-delivery.component.html index 3ca78fe6..b8a6a9de 100644 --- a/src/app/layout/sections/municipality-management/supplies-delivery/supplies-delivery.component.html +++ b/src/app/layout/sections/municipality-management/supplies-delivery/supplies-delivery.component.html @@ -1,6 +1,6 @@
      @@ -74,7 +74,7 @@

      Entrega de información - Habilitación Catastral

      diff --git a/src/app/layout/sections/municipality-management/workspace-active/workspace-active.component.html b/src/app/layout/sections/municipality-management/workspace-active/workspace-active.component.html index 239c253c..57dd17ef 100644 --- a/src/app/layout/sections/municipality-management/workspace-active/workspace-active.component.html +++ b/src/app/layout/sections/municipality-management/workspace-active/workspace-active.component.html @@ -1,6 +1,6 @@
      @@ -74,7 +74,7 @@

      Búsqueda de Municipios

      diff --git a/src/app/layout/sections/municipality-management/workspace-active/workspace-active.component.ts b/src/app/layout/sections/municipality-management/workspace-active/workspace-active.component.ts index feb5a4b5..4d58b988 100644 --- a/src/app/layout/sections/municipality-management/workspace-active/workspace-active.component.ts +++ b/src/app/layout/sections/municipality-management/workspace-active/workspace-active.component.ts @@ -53,6 +53,16 @@ export class WorkspaceActiveComponent implements OnInit { .getMunicipalitiesByManager(this.selectManager) .subscribe((data) => { this.munucipalities = data; + this.munucipalities.sort(function (a, b) { + if (a.department.name > b.department.name) { + return 1; + } + if (a.department.name < b.department.name) { + return -1; + } + //a must be equal to b + return 0; + }); }); } searchWorkSpaceActive() { @@ -66,9 +76,7 @@ export class WorkspaceActiveComponent implements OnInit { ]); } else { this.isActive = false; - this.toastrService.error( - 'No existe un espacio de trabajo para el municipio.' - ); + this.toastrService.error('No existe una gestión del municipio.'); } }); } diff --git a/src/app/layout/sections/municipality-management/workspace-refuse/workspace-refuse.component.html b/src/app/layout/sections/municipality-management/workspace-refuse/workspace-refuse.component.html index 449fb720..47ee7cba 100644 --- a/src/app/layout/sections/municipality-management/workspace-refuse/workspace-refuse.component.html +++ b/src/app/layout/sections/municipality-management/workspace-refuse/workspace-refuse.component.html @@ -1,12 +1,12 @@
      -

      Desasignar espacio de trabajo

      +

      Desasignar gestión del municipio

      @@ -65,7 +65,7 @@

      Desasignar espacio de trabajo

      + +
      +

      + ¿Está seguro de desasignar el Municipio a este gestor? +

      + +
      +
      +
      + Advertencia: Esta acción desasignará el municipio al gestor + seleccionado. +
      +
      +
      +
      + +
      +
      + +
      +
      +
      diff --git a/src/app/layout/sections/municipality-management/workspace-refuse/workspace-refuse.component.ts b/src/app/layout/sections/municipality-management/workspace-refuse/workspace-refuse.component.ts index 7533647a..fea7e4de 100644 --- a/src/app/layout/sections/municipality-management/workspace-refuse/workspace-refuse.component.ts +++ b/src/app/layout/sections/municipality-management/workspace-refuse/workspace-refuse.component.ts @@ -6,6 +6,7 @@ import { RoleModel } from 'src/app/helpers/role.model'; import { CadastralAuthorityService } from 'src/app/services/v2/cadastral-authority/cadastral-authority.service'; import { ManagersService } from 'src/app/services/managers/managers.service'; import { WorkspacesService } from 'src/app/services/workspaces/workspaces.service'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; @Component({ selector: 'app-workspace-refuse', @@ -25,7 +26,8 @@ export class WorkspaceRefuseComponent implements OnInit { private cadastralAuthorityService: CadastralAuthorityService, private roles: RoleModel, public toastrService: ToastrService, - private serviceManagers: ManagersService + private serviceManagers: ManagersService, + private modalService: NgbModal ) { this.activeManagers = []; this.selectManager = 0; @@ -67,7 +69,7 @@ export class WorkspaceRefuseComponent implements OnInit { this.isAdministrator = false; this.selectMunicipality = 0; this.isActiveSearch = false; - this.toastrService.success('Ha desasignado el espacio de trabajo.'); + this.toastrService.success('Ha desasignado el municipio.'); }); } changeMunicipalitie() { @@ -76,4 +78,13 @@ export class WorkspaceRefuseComponent implements OnInit { this.isActiveSearch = true; } } + openModalRefuse(modal: any) { + this.modalService.open(modal, { centered: true, scrollable: true }); + } + closeModalRefuse(option: boolean) { + this.modalService.dismissAll(); + if (option) { + this.refuseWorkSpaceActive(); + } + } } diff --git a/src/app/layout/sections/supplies/request-providers/peticiones-proveedor.component.html b/src/app/layout/sections/supplies/request-providers/peticiones-proveedor.component.html index b4425731..a19aa670 100644 --- a/src/app/layout/sections/supplies/request-providers/peticiones-proveedor.component.html +++ b/src/app/layout/sections/supplies/request-providers/peticiones-proveedor.component.html @@ -32,7 +32,7 @@ ID - Proveedor + Gestor Descripción Estado Fecha de petición @@ -42,7 +42,7 @@ {{ item.id }} - {{ item.provider.name }} + {{ item.manager.name }} - - preview - + + preview + + - - edit - + + edit + + diff --git a/src/app/layout/sections/municipality-management/operator-assignment/operator-assignment.component.ts b/src/app/layout/sections/municipality-management/operator-assignment/operator-assignment.component.ts index 7eeeda10..a57effa5 100644 --- a/src/app/layout/sections/municipality-management/operator-assignment/operator-assignment.component.ts +++ b/src/app/layout/sections/municipality-management/operator-assignment/operator-assignment.component.ts @@ -285,9 +285,13 @@ export class OperatorAssignmentComponent implements OnInit { } } changeUpdate(index: number, idManager: number) { + this.editForm.forEach((element) => { + element.startDate = false; + element.observations = false; + }); + this.idManagerUpdate = idManager; this.editForm[index].startDate = true; this.editForm[index].observations = true; - this.idManagerUpdate = idManager; } update(index: number) { const dataUpdate: UpdateInformationByWorkspace = { @@ -582,4 +586,21 @@ export class OperatorAssignmentComponent implements OnInit { this.isActiveAssignOperator = false; this.isChangeDataOperator = false; } + cancelarUpdate(index: number) { + this.idManagerUpdate = 0; + this.editForm[index].startDate = false; + this.editForm[index].observations = false; + this.serviceWorkspaces + .getWorkSpace(this.idWorkspace) + .subscribe((response: any) => { + this.dataWorkSpace = response; + this.dataWorkSpace.managers.forEach((_) => { + this.editForm.push({ + startDate: false, + observations: false, + }); + }); + this.selectDepartment = this.dataWorkSpace.municipality.department.id; + }); + } } From 6eb3805c1e15fcf666a7b51c0c003f973a05ab2d Mon Sep 17 00:00:00 2001 From: MauricioAcosta Date: Thu, 25 Mar 2021 15:02:32 -0500 Subject: [PATCH 27/54] fixes --- .../components/sidebar/sidebar.component.ts | 4 +- .../revisiones-pendientes.component.html | 383 +++++++++++------- .../revisiones-pendientes.component.ts | 52 ++- .../solicitud.component.html | 4 +- .../buscar-solicitud.component.html | 6 +- 5 files changed, 273 insertions(+), 176 deletions(-) diff --git a/src/app/layout/components/sidebar/sidebar.component.ts b/src/app/layout/components/sidebar/sidebar.component.ts index 2af9a3fa..a3092464 100644 --- a/src/app/layout/components/sidebar/sidebar.component.ts +++ b/src/app/layout/components/sidebar/sidebar.component.ts @@ -84,8 +84,8 @@ export class SidebarComponent implements OnInit { return ( elem.id === this.roles.superAdministrador || elem.id === this.roles.administrador || - (this.user.is_manager_director === this.roles.gestorDirector && - elem.id === this.roles.gestor) || + // (this.user.is_manager_director === this.roles.gestorDirector && + // elem.id === this.roles.gestor) || (this.user.is_provider_director === this.roles.proveedorDirector && elem.id === this.roles.proveedor) ); diff --git a/src/app/layout/sections/supplies/pending-reviews/revisiones-pendientes.component.html b/src/app/layout/sections/supplies/pending-reviews/revisiones-pendientes.component.html index 4b4dab90..9635f12e 100644 --- a/src/app/layout/sections/supplies/pending-reviews/revisiones-pendientes.component.html +++ b/src/app/layout/sections/supplies/pending-reviews/revisiones-pendientes.component.html @@ -1,162 +1,251 @@
      - - -
      -
      -
      -

      Revisiones Pendientes -

      ({{numSolicitudes}})

      - -
      -
      -
      - -
      -
      - - - - - - - - - - - - - - - - - - - - - - - - - - + +
      IDDepartamentoMunicipioAreá de trabajoInsumoObservación
      GESTOR      		Observación
      PROVEEDOR      		Fecha de cargueEstadoOpciones
      {{item.id}} - {{item.request.municipality.department.name}} - - {{item.request.municipality.name}} - {{item.typeSupply.providerProfile.name}}{{item.typeSupply.name}} - - - - {{formatDate(item.deliveredAt)}} -
      -
      - {{item.state.name}} -
      -
      -
      -
      - - {{item.state.name}} + + +
      +
      +
      +

      + Revisiones Pendientes +

      ({{ numSolicitudes }})

      + +
      +
      +
      + +
      +
      + + + + + + + + + + + + + + + + + + + + + + + + + + - + - -
      -

      - ¿Está seguro de iniciar la revisión? -

      -
      + +
      --
      + + +
      +

      + ¿Está seguro de iniciar la revisión? +

      + -
      -
      -
      - Advertencia: Va a iniciar la revisión. -
      -
      -
      -
      - -
      -
      - -
      -
      -       - -
      -

      - ¿Está seguro de omitir la revisión? -

      -
      +
      +
      + Advertencia: Va a iniciar la revisión. +
      +
      +
      +
      + +
      +
      + +
      +
      +       + +
      +

      + ¿Está seguro de omitir la revisión? +

      + -
      -
      -
      - Advertencia: Va a omitir la revisión y va hacer entrega de este insumo al Gestor. -
      -
      -
      -
      - -
      -
      - -
      -
      -       -       - -
      IDDepartamentoMunicipioAreá de trabajoInsumo + Observación
      + GESTOR +       		+ Observación
      + PROVEEDOR +       		Fecha de cargueEstadoOpciones
      {{ item.id }} + {{ item.request.municipality.department.name }} + + {{ item.request.municipality.name }} + {{ item.typeSupply.providerProfile.name }}{{ item.typeSupply.name }} + + + + {{ formatDate(item.deliveredAt) }} +
      +
      + {{ + item.state.name + }} +
      +
      +
      +
      + + {{ item.state.name }} -
      -
      -
      -
      - - {{item.state.name}} +
      +
      +
      +
      + + {{ item.state.name }} -
      -
      -
      -
      - {{item.state.name}} -
      -
      -       		-
      -
      - +
      +
      +
      +
      + {{ + item.state.name + }} +
      +
      +       		+
      +
      + not_started -
      -
      - - switch_camera - -
      -
      -
      - -- -
      -
      -
      - +
      +
      + switch_camera +
      +
      +
      --
      +
      +
      + input -
      -
      -
      - -- -
      -
      -
      -
      -
      - +
      +
      +
      + Advertencia: Va a omitir la revisión y va hacer entrega de + este insumo al Gestor. +
      +
      +
      +
      + +
      +
      +
      -
      +
      + +
      +
      +
      +
      + +
      +
      -
      \ No newline at end of file +
      +
      diff --git a/src/app/layout/sections/supplies/pending-reviews/revisiones-pendientes.component.ts b/src/app/layout/sections/supplies/pending-reviews/revisiones-pendientes.component.ts index b578f629..2f41f4e3 100644 --- a/src/app/layout/sections/supplies/pending-reviews/revisiones-pendientes.component.ts +++ b/src/app/layout/sections/supplies/pending-reviews/revisiones-pendientes.component.ts @@ -10,7 +10,7 @@ const moment = _moment; @Component({ selector: 'app-revisiones-pendientes', templateUrl: './revisiones-pendientes.component.html', - styleUrls: ['./revisiones-pendientes.component.scss'] + styleUrls: ['./revisiones-pendientes.component.scss'], }) export class RevisionesPendientesComponent implements OnInit { data: any; @@ -21,17 +21,18 @@ export class RevisionesPendientesComponent implements OnInit { private toastr: ToastrService, private router: Router, private modalService: NgbModal - ) { this.data = []; this.numSolicitudes = 0; } ngOnInit(): void { - this.serviceWorkspace.GetSuppliesRequestedToReview().subscribe(response => { - this.data = response; - this.numSolicitudes = this.data.length; - }); + this.serviceWorkspace + .GetSuppliesRequestedToReview() + .subscribe((response) => { + this.data = response; + this.numSolicitudes = this.data.length; + }); } formatDate(date: string) { moment.locale('es'); @@ -44,31 +45,38 @@ export class RevisionesPendientesComponent implements OnInit { return data.user.name; } startRevision(supplyRequestedId: number) { - this.serviceWorkspace.StartRevision(supplyRequestedId).subscribe( - (item: any) => { + this.serviceWorkspace + .StartRevision(supplyRequestedId) + .subscribe((item: any) => { this.toastr.success(item.message); - this.serviceWorkspace.GetSuppliesRequestedToReview().subscribe(response => { - this.data = response; - this.numSolicitudes = this.data.length; - }); - } - ); + this.serviceWorkspace + .GetSuppliesRequestedToReview() + .subscribe((response) => { + this.data = response; + this.numSolicitudes = this.data.length; + }); + }); } skipRevision(supplyRequestedId: number) { - this.serviceWorkspace.skipRevision(supplyRequestedId).subscribe((item: any) => { - this.toastr.success(item.message); - this.serviceWorkspace.GetSuppliesRequestedToReview().subscribe(response => { - this.data = response; - this.numSolicitudes = this.data.length; + this.serviceWorkspace + .skipRevision(supplyRequestedId) + .subscribe((item: any) => { + this.toastr.success(item.message); + this.serviceWorkspace + .GetSuppliesRequestedToReview() + .subscribe((response) => { + this.data = response; + this.numSolicitudes = this.data.length; + }); }); - }); } viewRecords(supplyRequestedId: number) { - this.router.navigate(['/insumos/revisiones-pendientes/registros/' + supplyRequestedId]); + this.router.navigate([ + '/insumos/revisiones-pendientes/registros/' + supplyRequestedId, + ]); } openModal(modal: any) { this.modalService.open(modal, { scrollable: true, centered: true }); - } closeModal(supplyRequestedId: number, option: boolean) { if (option) { diff --git a/src/app/layout/sections/supplies/providers-request/solicitud.component.html b/src/app/layout/sections/supplies/providers-request/solicitud.component.html index b727ce17..18a7b9ee 100644 --- a/src/app/layout/sections/supplies/providers-request/solicitud.component.html +++ b/src/app/layout/sections/supplies/providers-request/solicitud.component.html @@ -335,7 +335,7 @@

      Solicitud enviada correctamente

      - Número de orden: + Código de la Orden: Solicitud enviada correctamente >{{ dataOrder[0].packageLabel }} diff --git a/src/app/layout/sections/supplies/search-request/buscar-solicitud.component.html b/src/app/layout/sections/supplies/search-request/buscar-solicitud.component.html index 9ddcf60d..b6a3d963 100644 --- a/src/app/layout/sections/supplies/search-request/buscar-solicitud.component.html +++ b/src/app/layout/sections/supplies/search-request/buscar-solicitud.component.html @@ -709,7 +709,7 @@
      Resultados de Búsqueda
      - + @@ -804,7 +804,7 @@

      Solicitud

      Número de ordenCódigo de la Orden Departamento Municipio Proveedor
      - + @@ -934,7 +934,7 @@

      Solicitud

      >
      From 9bdc97133a4b49c35908955d24aeea98097057dc Mon Sep 17 00:00:00 2001 From: MauricioAcosta Date: Mon, 5 Apr 2021 12:55:31 -0500 Subject: [PATCH 28/54] add tabs --- .../list-user/list-user.component.html | 47 ++++++++++++++++++- .../list-user/list-user.component.ts | 2 + 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/src/app/layout/sections/administrator/list-user/list-user.component.html b/src/app/layout/sections/administrator/list-user/list-user.component.html index f00f09e8..2e77c8d1 100644 --- a/src/app/layout/sections/administrator/list-user/list-user.component.html +++ b/src/app/layout/sections/administrator/list-user/list-user.component.html @@ -1,6 +1,49 @@ + + +
      +
      +
      + +
      +
      - -
      diff --git a/src/app/layout/sections/administrator/list-user/list-user.component.ts b/src/app/layout/sections/administrator/list-user/list-user.component.ts index 3b0f0bb5..a318dd86 100644 --- a/src/app/layout/sections/administrator/list-user/list-user.component.ts +++ b/src/app/layout/sections/administrator/list-user/list-user.component.ts @@ -22,6 +22,7 @@ export class ListUserComponent implements OnInit { roleConnectAdmin: any; roleConnectManager: any; roleConnectProvider: any; + tab: number; constructor( private serviceWorkspace: WorkspacesService, private modalService: NgbModal, @@ -37,6 +38,7 @@ export class ListUserComponent implements OnInit { this.roleConnectAdmin = {}; this.roleConnectManager = {}; this.roleConnectProvider = {}; + this.tab = 1; } ngOnInit() { From 1deee1717f7bfa8f8c1622309dae63c0d23a8c9f Mon Sep 17 00:00:00 2001 From: MauricioAcosta Date: Mon, 5 Apr 2021 13:52:27 -0500 Subject: [PATCH 29/54] change button --- .../operator-assignment.component.html | 21 +++++++------------ 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/src/app/layout/sections/municipality-management/operator-assignment/operator-assignment.component.html b/src/app/layout/sections/municipality-management/operator-assignment/operator-assignment.component.html index 81fd26d8..c1815e17 100644 --- a/src/app/layout/sections/municipality-management/operator-assignment/operator-assignment.component.html +++ b/src/app/layout/sections/municipality-management/operator-assignment/operator-assignment.component.html @@ -133,21 +133,14 @@
      + @@ -108,6 +108,7 @@ : (page - 1) * pageSize + pageSize " > + @@ -251,8 +252,7 @@
      -
      -
      +
      Número de ordenCódigo de la Orden Departamento Municipio Proveedor
      - - - edit - - - + Editar +
      - +
      Gestor Usuario Nombres Apellidos{{ item.manager.name }} {{ item.username }} {{ item.firstName }} {{ item.lastName }}
      + @@ -317,6 +318,7 @@
      : (page - 1) * pageSize + pageSize " > +
      @@ -482,7 +484,7 @@
      -
      +
      @@ -524,21 +526,11 @@
      placeholder=" Buscar" />
      - +
      -
      +
      +
      + Ver log +
      + +
      +

      Logs

      + +
      +
      + {{ errorXTF }} +
      +
      +
      diff --git a/src/app/layout/sections/supplies/load-supplies/cargue.component.scss b/src/app/layout/sections/supplies/load-supplies/cargue.component.scss index 9f0c1488..bbcc742d 100644 --- a/src/app/layout/sections/supplies/load-supplies/cargue.component.scss +++ b/src/app/layout/sections/supplies/load-supplies/cargue.component.scss @@ -1,3 +1,7 @@ .uploadSupply { background-color: lightsteelblue; } +.logsXTF{ + color: #007bff; + cursor: pointer; +} diff --git a/src/app/layout/sections/supplies/load-supplies/cargue.component.ts b/src/app/layout/sections/supplies/load-supplies/cargue.component.ts index 79b98461..c88311a2 100644 --- a/src/app/layout/sections/supplies/load-supplies/cargue.component.ts +++ b/src/app/layout/sections/supplies/load-supplies/cargue.component.ts @@ -12,7 +12,7 @@ const moment = _moment; @Component({ selector: 'app-cargue', templateUrl: './cargue.component.html', - styleUrls: ['./cargue.component.scss'] + styleUrls: ['./cargue.component.scss'], }) export class CargueComponent implements OnInit { idInsumo: string; @@ -27,6 +27,7 @@ export class CargueComponent implements OnInit { myInputVariable: ElementRef; previewData: FileList; fileUrl = ''; + errorXTF: string; constructor( private toastr: ToastrService, private router: Router, @@ -37,8 +38,8 @@ export class CargueComponent implements OnInit { ) { this.respuestaValidador = [ { - isValid: null - } + isValid: null, + }, ]; this.xtf = true; this.button = { status: true }; @@ -47,93 +48,130 @@ export class CargueComponent implements OnInit { this.type = [ { name: 'Archivo', - file: 'file' + file: 'file', }, { name: 'URL', - file: 'url' - + file: 'url', }, { name: 'No disponible', - file: 'none' - } + file: 'none', + }, ]; this.closeRequestButton = true; this.closeRequestButtonArray = []; + this.errorXTF = ''; } ngOnInit() { const promise1 = new Promise((resolve) => { - this.activedRoute.params.subscribe( - response => { - this.idInsumo = response.idInsumo; - resolve(response); - } - ); + this.activedRoute.params.subscribe((response) => { + this.idInsumo = response.idInsumo; + resolve(response); + }); }); const promise2 = new Promise((resolve) => { - this.serviceWorkspaces.getPendingRequestByProvider().subscribe( - data => { - this.dataRequestPending = data; - resolve(data); - } - ); + this.serviceWorkspaces.getPendingRequestByProvider().subscribe((data) => { + this.dataRequestPending = data; + console.log(data); + resolve(data); + }); }); - Promise.all([promise1, promise2]).then(_ => { - this.dataRequestPending = this.dataRequestPending.filter((element: any) => { - if (element.id.toString() === this.idInsumo) { - return element; + Promise.all([promise1, promise2]).then((_) => { + this.dataRequestPending = this.dataRequestPending.filter( + (element: any) => { + if (element.id.toString() === this.idInsumo) { + return element; + } } - }); - this.closeRequestButtonArray = this.dataRequestPending[0].suppliesRequested.filter((item: any) => { - if (item.state.id === 1 || item.state.id === 5) { - return item.state; + ); + this.closeRequestButtonArray = this.dataRequestPending[0].suppliesRequested.filter( + (item: any) => { + if (item.state.id === 1 || item.state.id === 5) { + return item.state; + } } - }); - if (this.dataRequestPending[0].suppliesRequested.length === this.closeRequestButtonArray.length) { + ); + if ( + this.dataRequestPending[0].suppliesRequested.length === + this.closeRequestButtonArray.length + ) { this.closeRequestButton = false; } // tslint:disable-next-line: prefer-for-of for (let index = 0; index < this.dataRequestPending.length; index++) { // tslint:disable-next-line:prefer-for-of - for (let index2 = 0; index2 < this.dataRequestPending[index].suppliesRequested.length; index2++) { - this.dataRequestPending[index].suppliesRequested[index2].type = this.clone(this.type); - this.dataRequestPending[index].suppliesRequested[index2].button = this.clone(this.button); - this.dataRequestPending[index].suppliesRequested[index2].preview = false; + for ( + let index2 = 0; + index2 < this.dataRequestPending[index].suppliesRequested.length; + index2++ + ) { + this.dataRequestPending[index].suppliesRequested[ + index2 + ].type = this.clone(this.type); + this.dataRequestPending[index].suppliesRequested[ + index2 + ].button = this.clone(this.button); + this.dataRequestPending[index].suppliesRequested[ + index2 + ].preview = false; // tslint:disable-next-line:prefer-for-of - for (let index3 = 0; - index3 < this.dataRequestPending[index].suppliesRequested[index2].typeSupply.extensions.length; - index3++) { - this.dataRequestPending[index].suppliesRequested[index2]. - format = this.dataRequestPending[index].suppliesRequested[index2].typeSupply.extensions.map( + for ( + let index3 = 0; + index3 < + this.dataRequestPending[index].suppliesRequested[index2].typeSupply + .extensions.length; + index3++ + ) { + this.dataRequestPending[index].suppliesRequested[ + index2 + ].format = this.dataRequestPending[index].suppliesRequested[ + index2 + ].typeSupply.extensions + .map( // tslint:disable-next-line:only-arrow-functions function (elem: any) { return '.' + elem.name; - }).join(','); + } + ) + .join(','); this.dataRequestPending[index].suppliesRequested[index2].format = - this.dataRequestPending[index].suppliesRequested[index2].format + ',.zip'; + this.dataRequestPending[index].suppliesRequested[index2].format + + ',.zip'; - if (this.dataRequestPending[index].suppliesRequested[index2].typeSupply.extensions[index3].name === 'xtf') { - this.dataRequestPending[index].suppliesRequested[index2].xtf = this.clone(this.xtf); - this.dataRequestPending[index].suppliesRequested[index2].type = [{ - name: 'Archivo', - file: 'file' - }, - { - name: 'No disponible', - file: 'none' - }]; + if ( + this.dataRequestPending[index].suppliesRequested[index2] + .typeSupply.extensions[index3].name === 'xtf' + ) { + this.dataRequestPending[index].suppliesRequested[ + index2 + ].xtf = this.clone(this.xtf); + this.dataRequestPending[index].suppliesRequested[index2].type = [ + { + name: 'Archivo', + file: 'file', + }, + { + name: 'No disponible', + file: 'none', + }, + ]; } - if (this.dataRequestPending[index].suppliesRequested[index2].state.id === 1) { - this.dataRequestPending[index].suppliesRequested[index2].preview = true; + if ( + this.dataRequestPending[index].suppliesRequested[index2].state + .id === 1 + ) { + this.dataRequestPending[index].suppliesRequested[ + index2 + ].preview = true; } - } } } - this.dataRequestPending[0].suppliesRequested = - this.dataRequestPending[0].suppliesRequested.sort((a, b) => a.id - b.id); + this.dataRequestPending[0].suppliesRequested = this.dataRequestPending[0].suppliesRequested.sort( + (a, b) => a.id - b.id + ); }); } formatDate(date: string) { @@ -149,63 +187,87 @@ export class CargueComponent implements OnInit { let re = /zip*/; if (files[0].type.match(re)) { const formato = files[0].name.split('.').pop(); - let formatoPermitido = this.dataRequestPending[idOut].suppliesRequested[idInt].format.split(','); + let formatoPermitido = this.dataRequestPending[idOut].suppliesRequested[ + idInt + ].format.split(','); formatoPermitido = formatoPermitido.map( // tslint:disable-next-line:only-arrow-functions function (elem: any) { return elem.substr(1); - }); - const archivoValido = formatoPermitido.filter(item => { + } + ); + const archivoValido = formatoPermitido.filter((item) => { return item === formato; }); if (archivoValido.length > 0) { - this.dataRequestPending[idOut].suppliesRequested[idInt].file = files[0]; + this.dataRequestPending[idOut].suppliesRequested[idInt].file = + files[0]; this.validsendFile(idOut, idInt); } else { - this.dataRequestPending[idOut].suppliesRequested[idInt].button.status = true; - this.toastr.error('El formato no es valido, por favor subir en: ' + - this.dataRequestPending[idOut].suppliesRequested[idInt].format); + this.dataRequestPending[idOut].suppliesRequested[ + idInt + ].button.status = true; + this.toastr.error( + 'El formato no es valido, por favor subir en: ' + + this.dataRequestPending[idOut].suppliesRequested[idInt].format + ); } } else { if (files[0].size / 1024 / 1024 > environment.sizeFileUnZip) { - this.toastr.error('Por favor convierta el archivo en .zip antes de subirlo, ya que supera el tamaño de cargue permitido.') + this.toastr.error( + 'Por favor convierta el archivo en .zip antes de subirlo, ya que supera el tamaño de cargue permitido.' + ); this.dataRequestPending[idOut].suppliesRequested[idInt].file = ''; - this.myInputVariable.nativeElement.value = ""; + this.myInputVariable.nativeElement.value = ''; } else { const formato = files[0].name.split('.').pop(); - let formatoPermitido = this.dataRequestPending[idOut].suppliesRequested[idInt].format.split(','); + let formatoPermitido = this.dataRequestPending[ + idOut + ].suppliesRequested[idInt].format.split(','); formatoPermitido = formatoPermitido.map( // tslint:disable-next-line:only-arrow-functions function (elem: any) { return elem.substr(1); - }); - const archivoValido = formatoPermitido.filter(item => { + } + ); + const archivoValido = formatoPermitido.filter((item) => { return item === formato; }); if (archivoValido.length > 0) { - this.dataRequestPending[idOut].suppliesRequested[idInt].file = files[0]; + this.dataRequestPending[idOut].suppliesRequested[idInt].file = + files[0]; this.validsendFile(idOut, idInt); } else { - this.dataRequestPending[idOut].suppliesRequested[idInt].button.status = true; - this.toastr.error('El formato no es valido, por favor subir en: ' + - this.dataRequestPending[idOut].suppliesRequested[idInt].format); + this.dataRequestPending[idOut].suppliesRequested[ + idInt + ].button.status = true; + this.toastr.error( + 'El formato no es valido, por favor subir en: ' + + this.dataRequestPending[idOut].suppliesRequested[idInt].format + ); } } } } else { this.dataRequestPending[idOut].suppliesRequested[idInt].file = ''; this.myInputVariable.nativeElement.value = ''; - this.toastr.error('No se puede cargar el archivo, supera el tamaño máximo permitido de 190 MB.') + this.toastr.error( + 'No se puede cargar el archivo, supera el tamaño máximo permitido de 190 MB.' + ); } } validsendFile(idOut: number, idInt: number) { if (this.dataRequestPending[idOut].suppliesRequested[idInt].observations) { if (this.dataRequestPending[idOut].suppliesRequested[idInt].file) { - this.dataRequestPending[idOut].suppliesRequested[idInt].button.status = false; + this.dataRequestPending[idOut].suppliesRequested[ + idInt + ].button.status = false; } else { - this.toastr.error('Por favor sube el archivo en alguno de los siguientes formatos: ' + - this.dataRequestPending[idOut].suppliesRequested[idInt].format); + this.toastr.error( + 'Por favor sube el archivo en alguno de los siguientes formatos: ' + + this.dataRequestPending[idOut].suppliesRequested[idInt].format + ); } } else { this.toastr.info('La observación del archivo es obligatoria'); @@ -215,25 +277,39 @@ export class CargueComponent implements OnInit { // https://stackoverflow.com/questions/8667070/javascript-regular-expression-to-validate-url function validateUrl(value) { // tslint:disable-next-line:max-line-length - return /^(?:(?:(?:https?|ftp?|ftps?|http?|ftpes?|sftp?|afp?|nfs?|smb?|ssh?|dav?|davs?):)?\/\/)(?:\S+(?::\S*)?@)?(?:(?!(?:10|127)(?:\.\d{1,3}){3})(?!(?:169\.254|192\.168)(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)(?:\.(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)*(?:\.(?:[a-z\u00a1-\uffff]{2,})))(?::\d{2,5})?(?:[/?#]\S*)?$/i.test(value); + return /^(?:(?:(?:https?|ftp?|ftps?|http?|ftpes?|sftp?|afp?|nfs?|smb?|ssh?|dav?|davs?):)?\/\/)(?:\S+(?::\S*)?@)?(?:(?!(?:10|127)(?:\.\d{1,3}){3})(?!(?:169\.254|192\.168)(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)(?:\.(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)*(?:\.(?:[a-z\u00a1-\uffff]{2,})))(?::\d{2,5})?(?:[/?#]\S*)?$/i.test( + value + ); } - if (validateUrl(this.dataRequestPending[idOut].suppliesRequested[idInt].url)) { - if (this.dataRequestPending[idOut].suppliesRequested[idInt].observations) { - this.dataRequestPending[idOut].suppliesRequested[idInt].button.status = false; + if ( + validateUrl(this.dataRequestPending[idOut].suppliesRequested[idInt].url) + ) { + if ( + this.dataRequestPending[idOut].suppliesRequested[idInt].observations + ) { + this.dataRequestPending[idOut].suppliesRequested[ + idInt + ].button.status = false; } else { this.toastr.info('La observación es obligatoria'); } } else { - this.dataRequestPending[idOut].suppliesRequested[idInt].button.status = true; + this.dataRequestPending[idOut].suppliesRequested[ + idInt + ].button.status = true; this.toastr.error('La URL no es correcta.'); } } intoValidJustification(idOut: number, idInt: number) { if (this.dataRequestPending[idOut].suppliesRequested[idInt].justification) { - this.dataRequestPending[idOut].suppliesRequested[idInt].button.status = false; + this.dataRequestPending[idOut].suppliesRequested[ + idInt + ].button.status = false; } else { - this.dataRequestPending[idOut].suppliesRequested[idInt].button.status = true; + this.dataRequestPending[idOut].suppliesRequested[ + idInt + ].button.status = true; } } send(idSolicitud: string, item: any, idOut: number, idInt: number) { @@ -248,74 +324,108 @@ export class CargueComponent implements OnInit { } if (item.hasOwnProperty('justification')) { form.append('justification', item.justification); - } if (item.hasOwnProperty('url')) { form.append('url', item.url); form.append('observations', item.observations); } - this.serviceWorkspaces.loadSupplyFromRequest(idSolicitud, form).subscribe( - (data: any) => { + this.serviceWorkspaces + .loadSupplyFromRequest(idSolicitud, form) + .subscribe((data: any) => { let response = data.suppliesRequested.find((item: any) => { - return item.id == this.dataRequestPending[idOut].suppliesRequested[idInt].id; + return ( + item.id == + this.dataRequestPending[idOut].suppliesRequested[idInt].id + ); }); response.canUpload = true; response.type = this.clone(this.type); response.button = this.clone(this.button); - response.format = this.clone(this.dataRequestPending[idOut].suppliesRequested[idInt].typeSupply.extensions.map( - function (elem: any) { - return '.' + elem.name; - }).join(',')); - response.format = response.format + ',.zip' - for (let index3 = 0; index3 < this.dataRequestPending[idOut].suppliesRequested[idInt].typeSupply.extensions.length; index3++) { - if (this.dataRequestPending[idOut].suppliesRequested[idInt].typeSupply.extensions[index3].name === 'xtf') { + response.format = this.clone( + this.dataRequestPending[idOut].suppliesRequested[ + idInt + ].typeSupply.extensions + .map(function (elem: any) { + return '.' + elem.name; + }) + .join(',') + ); + response.format = response.format + ',.zip'; + for ( + let index3 = 0; + index3 < + this.dataRequestPending[idOut].suppliesRequested[idInt].typeSupply + .extensions.length; + index3++ + ) { + if ( + this.dataRequestPending[idOut].suppliesRequested[idInt].typeSupply + .extensions[index3].name === 'xtf' + ) { response.xtf = this.clone(this.xtf); - response.type = [{ - name: 'Archivo', - file: 'file' - }, - { - name: 'No disponible', - file: 'none' - }]; + response.type = [ + { + name: 'Archivo', + file: 'file', + }, + { + name: 'No disponible', + file: 'none', + }, + ]; } } - this.dataRequestPending[idOut].suppliesRequested[idInt] = this.clone(response); + this.dataRequestPending[idOut].suppliesRequested[idInt] = this.clone( + response + ); for (let sr of this.dataRequestPending[idOut].suppliesRequested) { this.dataRequestPending[0].suppliesRequested[idInt].preview = true; - this.fileUrl = this.dataRequestPending[0].suppliesRequested[idInt].url; + this.fileUrl = this.dataRequestPending[0].suppliesRequested[ + idInt + ].url; } - this.closeRequestButtonArray = this.dataRequestPending[0].suppliesRequested.filter((item: any) => { - if (item.state.id === 1 || item.state.id === 5) { - return item.state; + this.closeRequestButtonArray = this.dataRequestPending[0].suppliesRequested.filter( + (item: any) => { + if (item.state.id === 1 || item.state.id === 5) { + return item.state; + } } - }); - if (this.dataRequestPending[0].suppliesRequested.length === this.closeRequestButtonArray.length) { + ); + if ( + this.dataRequestPending[0].suppliesRequested.length === + this.closeRequestButtonArray.length + ) { this.closeRequestButton = false; } - } - ); + }); } closeRequest() { - this.serviceWorkspaces.closeRequest(this.dataRequestPending[0].id).subscribe( - _ => { + this.serviceWorkspaces + .closeRequest(this.dataRequestPending[0].id) + .subscribe((_) => { this.router.navigate(['/insumos/solicitudes/pendientes']); - } - ); + }); } modelChanged(item: any, idOut: number, idInt: number) { delete this.dataRequestPending[idOut].suppliesRequested[idInt].observations; delete this.dataRequestPending[idOut].suppliesRequested[idInt].file; delete this.dataRequestPending[idOut].suppliesRequested[idInt].url; - delete this.dataRequestPending[idOut].suppliesRequested[idInt].justification; + delete this.dataRequestPending[idOut].suppliesRequested[idInt] + .justification; if (item.type.file === this.typeDataFieldModel.typeDataFile) { - this.dataRequestPending[idOut].suppliesRequested[idInt].typeData = this.typeDataFieldModel.typeDataFile; + this.dataRequestPending[idOut].suppliesRequested[ + idInt + ].typeData = this.typeDataFieldModel.typeDataFile; } if (item.type.file === this.typeDataFieldModel.typeDataUrl) { - this.dataRequestPending[idOut].suppliesRequested[idInt].typeData = this.typeDataFieldModel.typeDataUrl; + this.dataRequestPending[idOut].suppliesRequested[ + idInt + ].typeData = this.typeDataFieldModel.typeDataUrl; } if (item.type.file === this.typeDataFieldModel.typeDataNone) { - this.dataRequestPending[idOut].suppliesRequested[idInt].typeData = this.typeDataFieldModel.typeDataNone; + this.dataRequestPending[idOut].suppliesRequested[ + idInt + ].typeData = this.typeDataFieldModel.typeDataNone; } } getEntity(item: any) { @@ -338,14 +448,17 @@ export class CargueComponent implements OnInit { this.modalService.dismissAll(); } } - preview(url: string) { - } + preview(url: string) {} nameButton() { - let data = this.dataRequestPending.find(element => { - return element.suppliesRequested.find(item => { + let data = this.dataRequestPending.find((element) => { + return element.suppliesRequested.find((item) => { return item.typeSupply.id === 12; }); }); return data ? true : false; } + openModalErrorXTF(modalError: any, supp: any) { + this.errorXTF = supp.errors; + this.modalService.open(modalError, { centered: true, scrollable: true }); + } } From ace58b1540878ea127da3002e3354b0742602f2c Mon Sep 17 00:00:00 2001 From: MauricioAcosta Date: Wed, 7 Apr 2021 12:52:34 -0500 Subject: [PATCH 34/54] add colum manager --- .../pending-reviews/revisiones-pendientes.component.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/app/layout/sections/supplies/pending-reviews/revisiones-pendientes.component.html b/src/app/layout/sections/supplies/pending-reviews/revisiones-pendientes.component.html index 9635f12e..74d2af20 100644 --- a/src/app/layout/sections/supplies/pending-reviews/revisiones-pendientes.component.html +++ b/src/app/layout/sections/supplies/pending-reviews/revisiones-pendientes.component.html @@ -29,6 +29,7 @@

      ({{ numSolicitudes }})

      + +
      Operador Usuario Nombres Apellidos{{ item.operator.name }} {{ item.username }} {{ item.firstName }} {{ item.lastName }}Municipio Areá de trabajo InsumoGestor Observación
      GESTOR @@ -53,6 +54,7 @@

      ({{ numSolicitudes }})

      		{{ item.typeSupply.providerProfile.name }} {{ item.typeSupply.name }}{{ getEntity(item.request) }}