diff --git a/src/app/admin/menu/menu.component.html b/src/app/admin/menu/menu.component.html index 14282bc..504e41e 100644 --- a/src/app/admin/menu/menu.component.html +++ b/src/app/admin/menu/menu.component.html @@ -83,6 +83,8 @@

Santillana

  • Productos
    • +
  • Kit de Productos +
  • Clientes
  • Colegios diff --git a/src/app/app.keys.ts b/src/app/app.keys.ts index 6921759..3d7d707 100644 --- a/src/app/app.keys.ts +++ b/src/app/app.keys.ts @@ -65,20 +65,22 @@ export namespace ProformDetail { export const ID = {prop: 'id', name: 'Id'}; export const PROFORM_ID = {prop: 'proform_id', name: 'proform_id'}; export const DEGREE = {prop: 'degree', name: 'Grado'}; - export const PRODUCT_ID = {prop: 'product_id', name: 'product_Id'}; + export const PRODUCT_ID = {prop: 'product_id', name: 'Producto'}; export const QUANTITY = {prop: 'quantity', name: 'Cantidad'}; export const PRICE = {prop: 'price', name: 'Precio'}; export const SUB_TOTAL = {prop: 'subtotal', name: 'Subtotal'}; - export const SALE_DIRECT = {prop: 'sale_direct', name: 'DIRECTO'}; - export const SALE_EXTERNAL_LIBRARY = {prop: 'sale_external_library', name: 'LIBRERÍA EXTERNA'}; - export const SALE_EVENT = {prop: 'sale_event', name: 'Material Promocional Premios para eventos'}; - export const SALE_TEACHER = {prop: 'sale_teacher', name: 'Material Promocional para profesores'}; - export const SALE_INFRASTRUCTURE = {prop: 'sale_infrastructure', name: 'Infraestructura PLANTEL'}; - export const SALE_SCHOLARSHIPS = {prop: 'sale_scholarships', name: 'Becas PLANTEL'}; - export const SALE_STAFF = {prop: 'sale_staff', name: 'Equipos PLANTEL'}; - export const SALE_TRAINING = {prop: 'sale_training', name: 'Capacitación PLANTEL'}; - export const CAPEX = {prop: 'capex', name: 'Beneficio'}; + export const SALE_DIRECT = {prop: 'sale_direct', name: 'Directo'}; + export const SALE_DONATION = {prop: 'sale_donation', name: 'Donación'}; + export const SALE_EXTERNAL_LIBRARY = {prop: 'sale_external_library', name: 'Librería'}; + export const SALE_EVENT = {prop: 'sale_event', name: 'Premios'}; + export const SALE_TEACHER = {prop: 'sale_teacher', name: 'Profesores'}; + export const SALE_INFRASTRUCTURE = {prop: 'sale_infrastructure', name: 'Infraestructura'}; + export const SALE_SCHOLARSHIPS = {prop: 'sale_scholarships', name: 'Becas'}; + export const SALE_STAFF = {prop: 'sale_staff', name: 'Equipos'}; + export const SALE_TRAINING = {prop: 'sale_training', name: 'Capacitación'}; + export const CAPEX = {prop: 'capex', name: 'Capex'}; export const TOTAL = {prop: 'total', name: 'Total'}; + export const QUANTITY_CHECK = {prop: 'quantity_check', name: 'Entregado'}; } export namespace TypeClientSale { @@ -104,7 +106,7 @@ export namespace ProductColumns { export const NIVEL = {prop: 'nivel', name: 'Nivel Educación'}; export const DEGREE = {prop: 'degree', name: 'Grado'}; export const BUSINESS_LINE = {prop: 'businessLine', name: 'Linea Negocios'}; - export const ISBN = {prop: 'isbn', name: 'ISBN'}; + export const ISBN = {prop: 'isbn', name: 'EAN'}; export const REGION = {prop: 'region', name: 'Región'}; } diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 95b9bf0..ca8710b 100755 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -24,7 +24,7 @@ import { PriceComponent } from './configuration/price/price.component'; declarations: [ AppComponent, UploadDirective, - PriceComponent + PriceComponent, ], imports: [ BrowserModule, diff --git a/src/app/app.type.ts b/src/app/app.type.ts index 35743aa..b1f102d 100644 --- a/src/app/app.type.ts +++ b/src/app/app.type.ts @@ -51,6 +51,7 @@ export type GridRecord = { quantity: 0, price: 0, sale_direct: 0, + sale_donation: 0, sale_external_library: 0, sale_event: 0, sale_teacher: 0, @@ -67,6 +68,7 @@ export type GridRecord = { quantity: 0, subtotal:0, sale_direct: number, + sale_donation: number, sale_external_library: number, sale_event: number, sale_teacher: number, @@ -88,6 +90,7 @@ export type GridRecord = { "subtotal":0, "total":0, "sale_direct": 0, + "sale_donation": 0, "sale_external_library": 0, "sale_event": 0, "sale_teacher": 0, @@ -95,7 +98,8 @@ export type GridRecord = { "sale_scholarships": 0, "sale_staff": 0, "sale_training": 0, - "capex": 0 + "capex": 0, + "quantity_check": 0, }; @@ -105,6 +109,7 @@ export type GridRecord = { "quantity": 0, "price": 0, "sale_direct": 0, + "sale_donation": 0, "sale_external_library": 0, "sale_event": 0, "sale_teacher": 0, @@ -114,7 +119,8 @@ export type GridRecord = { "sale_training": 0, "capex": 0, "proform_id": 0, - "product_id": 0 + "product_id": 0, + "quantity_check": 0, }; diff --git a/src/app/configuration/configuration-routing.module.ts b/src/app/configuration/configuration-routing.module.ts index 99c1984..2323be5 100644 --- a/src/app/configuration/configuration-routing.module.ts +++ b/src/app/configuration/configuration-routing.module.ts @@ -7,8 +7,10 @@ import { UserComponent } from './user/user.component'; import { CollegesComponent } from './colleges/colleges.component'; import { CampaignComponent } from './campaign/campaign.component'; import { PriceComponent } from './price/price.component'; +import { KitComponent } from './kit/kit.component'; const configurationRoutes: Routes = [ + { path: 'kit', component: KitComponent }, { path: 'product', component: ProductComponent }, { path: 'client', component: ClientComponent }, { path: 'user', component: UserComponent}, diff --git a/src/app/configuration/configuration.modules.ts b/src/app/configuration/configuration.modules.ts index 1b46bb7..6b576be 100644 --- a/src/app/configuration/configuration.modules.ts +++ b/src/app/configuration/configuration.modules.ts @@ -11,6 +11,7 @@ import { ClientComponent } from './client/client.component'; import { UserComponent } from './user/user.component'; import { CollegesComponent } from './colleges/colleges.component'; import { CampaignComponent } from './campaign/campaign.component'; +import { KitComponent } from './kit/kit.component'; @NgModule({ imports: [ @@ -27,7 +28,8 @@ import { CampaignComponent } from './campaign/campaign.component'; ClientComponent, UserComponent, CollegesComponent, - CampaignComponent + CampaignComponent, + KitComponent ], providers: [], exports: [], diff --git a/src/app/configuration/kit/kit.component.css b/src/app/configuration/kit/kit.component.css new file mode 100644 index 0000000..e69de29 diff --git a/src/app/configuration/kit/kit.component.html b/src/app/configuration/kit/kit.component.html new file mode 100644 index 0000000..cc0d903 --- /dev/null +++ b/src/app/configuration/kit/kit.component.html @@ -0,0 +1,15 @@ + + + + +
    +
    +
    +
    Kit de Productos +
    + +
    +
    + + +     \ No newline at end of file diff --git a/src/app/configuration/kit/kit.component.spec.ts b/src/app/configuration/kit/kit.component.spec.ts new file mode 100644 index 0000000..c90b147 --- /dev/null +++ b/src/app/configuration/kit/kit.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { KitComponent } from './kit.component'; + +describe('KitComponent', () => { + let component: KitComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ KitComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(KitComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/configuration/kit/kit.component.ts b/src/app/configuration/kit/kit.component.ts new file mode 100644 index 0000000..5059f03 --- /dev/null +++ b/src/app/configuration/kit/kit.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-kit', + templateUrl: './kit.component.html', + styleUrls: ['./kit.component.css'] +}) +export class KitComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/shared/components/grid/grid.component.ts b/src/app/shared/components/grid/grid.component.ts index fb16e40..0c39204 100644 --- a/src/app/shared/components/grid/grid.component.ts +++ b/src/app/shared/components/grid/grid.component.ts @@ -119,6 +119,7 @@ export class GridComponent implements OnInit, OnDestroy { case 'price': case 'subtotal': case 'sale_direct': + case 'sale_donation': case 'sale_external_library': case 'sale_event': case 'sale_teacher': @@ -134,14 +135,15 @@ export class GridComponent implements OnInit, OnDestroy { varField = _.replace(row[3], '%', ''); varField = _.replace(varField, ',', '.'); varRow = (row[1] === 'sale_direct' && varRow === 0 ) ? varRow = 7 : varRow = varRow; - varRow = (row[1] === 'sale_external_library' && varRow === 0 ) ? varRow = 8 : varRow = varRow; - varRow = (row[1] === 'sale_event' && varRow === 0 ) ? varRow = 9 : varRow = varRow; - varRow = (row[1] === 'sale_teacher' && varRow === 0 ) ? varRow = 10 : varRow = varRow; - varRow = (row[1] === 'sale_infrastructure' && varRow === 0 ) ? varRow = 11 : varRow = varRow; - varRow = (row[1] === 'sale_scholarships' && varRow === 0 ) ? varRow = 12 : varRow = varRow; - varRow = (row[1] === 'sale_staff' && varRow === 0 ) ? varRow = 13 : varRow = varRow; - varRow = (row[1] === 'sale_training' && varRow === 0 ) ? varRow = 14 : varRow = varRow; - varRow = (row[1] === 'capex' && varRow === 0 ) ? varRow = 15 : varRow = varRow; + varRow = (row[1] === 'sale_donation' && varRow === 0 ) ? varRow = 8 : varRow = varRow; + varRow = (row[1] === 'sale_external_library' && varRow === 0 ) ? varRow = 9 : varRow = varRow; + varRow = (row[1] === 'sale_event' && varRow === 0 ) ? varRow = 10 : varRow = varRow; + varRow = (row[1] === 'sale_teacher' && varRow === 0 ) ? varRow = 11 : varRow = varRow; + varRow = (row[1] === 'sale_infrastructure' && varRow === 0 ) ? varRow = 12 : varRow = varRow; + varRow = (row[1] === 'sale_scholarships' && varRow === 0 ) ? varRow = 13 : varRow = varRow; + varRow = (row[1] === 'sale_staff' && varRow === 0 ) ? varRow = 14 : varRow = varRow; + varRow = (row[1] === 'sale_training' && varRow === 0 ) ? varRow = 15 : varRow = varRow; + varRow = (row[1] === 'capex' && varRow === 0 ) ? varRow = 16 : varRow = varRow; this.setDataAtCell(row[0], varRow, Number(varField) ); @@ -149,6 +151,7 @@ export class GridComponent implements OnInit, OnDestroy { //statements; let sale_direct; + let sale_donation; let sale_external_library; let sale_event; let sale_teacher; @@ -159,20 +162,21 @@ export class GridComponent implements OnInit, OnDestroy { let capex; sale_direct = _.isNil(this.getDataAtCell(row[0],7)) ? sale_direct = 0 : sale_direct = Number(this.getDataAtCell(row[0],7)); - sale_external_library = _.isNil(this.getDataAtCell(row[0],8)) ? sale_external_library = 0 : sale_external_library = Number(this.getDataAtCell(row[0],8)); - sale_event = _.isNil(this.getDataAtCell(row[0],9)) ? sale_event = 0 : sale_event = Number(this.getDataAtCell(row[0],9)); - sale_teacher = _.isNil(this.getDataAtCell(row[0],10)) ? sale_teacher = 0 : sale_teacher = Number(this.getDataAtCell(row[0],10)); - sale_infrastructure = _.isNil(this.getDataAtCell(row[0],11)) ? sale_infrastructure = 0 : sale_infrastructure = Number(this.getDataAtCell(row[0],11)); - sale_scholarships = _.isNil(this.getDataAtCell(row[0],12)) ? sale_scholarships = 0 : sale_scholarships = Number(this.getDataAtCell(row[0],12)); - sale_staff = _.isNil(this.getDataAtCell(row[0],13)) ? sale_staff = 0 : sale_staff = Number(this.getDataAtCell(row[0],13)); - sale_training = _.isNil(this.getDataAtCell(row[0],14)) ? sale_training = 0 : sale_training = Number(this.getDataAtCell(row[0],14)); - capex = _.isNil(this.getDataAtCell(row[0],15)) ? capex = 0 : capex = Number(this.getDataAtCell(row[0],15)); - - let total_descount = sale_direct + sale_external_library + sale_event + sale_teacher + sale_infrastructure + sale_scholarships + sale_staff + sale_training + capex; + sale_donation = _.isNil(this.getDataAtCell(row[0],8)) ? sale_donation = 0 : sale_donation = Number(this.getDataAtCell(row[0],8)); + sale_external_library = _.isNil(this.getDataAtCell(row[0],9)) ? sale_external_library = 0 : sale_external_library = Number(this.getDataAtCell(row[0],9)); + sale_event = _.isNil(this.getDataAtCell(row[0],10)) ? sale_event = 0 : sale_event = Number(this.getDataAtCell(row[0],10)); + sale_teacher = _.isNil(this.getDataAtCell(row[0],11)) ? sale_teacher = 0 : sale_teacher = Number(this.getDataAtCell(row[0],11)); + sale_infrastructure = _.isNil(this.getDataAtCell(row[0],12)) ? sale_infrastructure = 0 : sale_infrastructure = Number(this.getDataAtCell(row[0],12)); + sale_scholarships = _.isNil(this.getDataAtCell(row[0],13)) ? sale_scholarships = 0 : sale_scholarships = Number(this.getDataAtCell(row[0],13)); + sale_staff = _.isNil(this.getDataAtCell(row[0],14)) ? sale_staff = 0 : sale_staff = Number(this.getDataAtCell(row[0],14)); + sale_training = _.isNil(this.getDataAtCell(row[0],15)) ? sale_training = 0 : sale_training = Number(this.getDataAtCell(row[0],15)); + capex = _.isNil(this.getDataAtCell(row[0],16)) ? capex = 0 : capex = Number(this.getDataAtCell(row[0],16)); + + let total_descount = sale_direct + sale_donation + sale_external_library + sale_event + sale_teacher + sale_infrastructure + sale_scholarships + sale_staff + sale_training + capex; let total = Number(this.getDataAtCell(row[0],6)) - ( Number(this.getDataAtCell(row[0],6)) * total_descount / 100 ); - this.setDataAtCell(row[0], 16, total ); + this.setDataAtCell(row[0], 17, total ); break; } } diff --git a/src/app/shared/components/project/check-project-renderer.component.ts b/src/app/shared/components/project/check-project-renderer.component.ts new file mode 100644 index 0000000..d019dce --- /dev/null +++ b/src/app/shared/components/project/check-project-renderer.component.ts @@ -0,0 +1,24 @@ +import {Component} from '@angular/core'; +import {ICellRendererAngularComp} from 'ag-grid-angular'; + +@Component({ + selector: 'child-cell', + template: ` + + ` +}) +export class CheckProjectRendererComponent implements ICellRendererAngularComp { + public params: any; + + agInit(params: any): void { + this.params = params; + } + + public invokeParentMethod() { + this.params.context.componentParent.checkProject(this.params.node); + } + + refresh(): boolean { + return false; + } +} diff --git a/src/app/shared/components/project/project.component.ts b/src/app/shared/components/project/project.component.ts index 5fa5760..5284972 100644 --- a/src/app/shared/components/project/project.component.ts +++ b/src/app/shared/components/project/project.component.ts @@ -8,6 +8,7 @@ import { Module } from 'ag-grid-community'; import * as _ from 'lodash'; import { selectionRenderComponent } from '../../render/selection-render.component'; import { SelectProjectRendererComponent } from './select-project-renderer.component'; +import { CheckProjectRendererComponent } from './check-project-renderer.component'; import { ExcelImportService } from '../../service/import-excel.service'; import { NgxUiLoaderService } from 'ngx-ui-loader'; import { ProformOptionsStateComponent } from 'src/app/ui/proform-state/proform-options-state/proform-options-state.component'; @@ -48,6 +49,8 @@ export class ProjectComponent implements OnInit { @Output() public exportExcel = new EventEmitter(); @Output() + public checkSelected = new EventEmitter(); + @Output() public projectSelected = new EventEmitter(); @Output() public emitJsonData = new EventEmitter(); @@ -61,6 +64,7 @@ export class ProjectComponent implements OnInit { this.context = { componentParent: this }; this.frameworkComponents = { selectionRender: selectionRenderComponent, + checkProjectRenderer: CheckProjectRendererComponent, selectProjectRenderer: SelectProjectRendererComponent, proformOptionsStateRenderer: ProformOptionsStateComponent @@ -87,6 +91,9 @@ export class ProjectComponent implements OnInit { this.projectSelected.emit(row); } + public checkProject(row) { + this.checkSelected.emit(row); + } public changeView() { this.uploadFile = !this.uploadFile; diff --git a/src/app/shared/service/export-excel.service.ts b/src/app/shared/service/export-excel.service.ts index 1308f16..3e22745 100644 --- a/src/app/shared/service/export-excel.service.ts +++ b/src/app/shared/service/export-excel.service.ts @@ -361,6 +361,7 @@ export class ExcelExportService { let row; const rowBlank = null; const totalDescount = ( footer['sale_direct'] + + footer['sale_donation'] + footer['sale_external_library'] + footer['sale_event'] + footer['sale_teacher'] + @@ -379,6 +380,7 @@ export class ExcelExportService { dataDetail.push(rowBlank); dataDetail.push(footer['subtotal'].toFixed(2)); dataDetail.push(footer['sale_direct'].toFixed(2)); + dataDetail.push(footer['sale_donation'].toFixed(2)); dataDetail.push(footer['sale_external_library'].toFixed(2)); dataDetail.push(footer['sale_event'].toFixed(2)); dataDetail.push(footer['sale_teacher'].toFixed(2)); @@ -419,6 +421,17 @@ export class ExcelExportService { cell.border = {top: {style: 'thin'}, left: {style: 'thin'}, bottom: {style: 'thin'}, right: {style: 'thin'}}; }); + dataDetail = []; + dataDetail.push(rowBlank); + dataDetail.push(rowBlank); + dataDetail.push(ProformDetail.SALE_DONATION.name); + dataDetail.push(footer['sale_donation'].toFixed(2)); + dataDetail.push( ( footer['sale_donation'] /100 * footer['subtotal'] ).toFixed(2) ); + row = worksheet.addRow(dataDetail); + row.eachCell((cell, number) => { + cell.border = {top: {style: 'thin'}, left: {style: 'thin'}, bottom: {style: 'thin'}, right: {style: 'thin'}}; + }); + dataDetail = []; dataDetail.push(rowBlank); dataDetail.push(rowBlank); diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 69911b2..8001cce 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -17,6 +17,7 @@ import { SelectProjectRendererComponent } from './components/project/select-proj import { NgxUiLoaderModule } from 'ngx-ui-loader'; import { NgbDropdownModule, NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { ProformOptionsStateComponent } from '../ui/proform-state/proform-options-state/proform-options-state.component'; +import { CheckProjectRendererComponent } from './components/project/check-project-renderer.component'; @NgModule({ imports: [ @@ -25,7 +26,11 @@ import { ProformOptionsStateComponent } from '../ui/proform-state/proform-option FormsModule, ReactiveFormsModule, NgxUiLoaderModule, - AgGridModule.withComponents([selectionRenderComponent, SelectProjectRendererComponent, ProformOptionsStateComponent]), + AgGridModule.withComponents([ + selectionRenderComponent, + SelectProjectRendererComponent, + CheckProjectRendererComponent, + ProformOptionsStateComponent]), HotTableModule.forRoot(), FormlyModule.forRoot({ types: [ @@ -47,7 +52,8 @@ import { ProformOptionsStateComponent } from '../ui/proform-state/proform-option HotableComponent, FormlyFieldNgbDatePicker, FormlyFieldNgbTimePicker, - SelectProjectRendererComponent + SelectProjectRendererComponent, + CheckProjectRendererComponent ], providers: [], exports: [ diff --git a/src/app/ui/proform-add/model/proformColumns.model.ts b/src/app/ui/proform-add/model/proformColumns.model.ts index 2582292..67a28e3 100644 --- a/src/app/ui/proform-add/model/proformColumns.model.ts +++ b/src/app/ui/proform-add/model/proformColumns.model.ts @@ -2,8 +2,6 @@ import { FormlyFieldConfig, FieldType } from '@ngx-formly/core'; import { Proform, ProformDetail } from '../../../app.keys'; import { of } from 'rxjs'; -import { PRODUCTS, COD } from '../product'; - export const COLUMNS_DETAIL_PROFORM = [ {field: ProformDetail.ID.prop, headerName: ProformDetail.ID.name, resizable: true, width: 60 }, @@ -14,6 +12,7 @@ export const COLUMNS_DETAIL_PROFORM = [ {field: ProformDetail.PRICE.prop, headerName: ProformDetail.PRICE.name, resizable: true, width: 100}, {field: ProformDetail.SUB_TOTAL.prop, headerName: ProformDetail.SUB_TOTAL.name, resizable: true, width: 100}, {field: ProformDetail.SALE_DIRECT.prop, headerName: ProformDetail.SALE_DIRECT.name, resizable: true, width: 100}, + {field: ProformDetail.SALE_DONATION.prop, headerName: ProformDetail.SALE_DONATION.name, resizable: true, width: 100}, {field: ProformDetail.SALE_EXTERNAL_LIBRARY.prop, headerName: ProformDetail.SALE_EXTERNAL_LIBRARY.name, resizable: true, width: 100}, {field: ProformDetail.SALE_EVENT.prop, headerName: ProformDetail.SALE_EVENT.name, resizable: true, width: 100}, {field: ProformDetail.SALE_TEACHER.prop, headerName: ProformDetail.SALE_TEACHER.name, resizable: true, width: 100}, @@ -31,19 +30,18 @@ export const COLUMNS_DETAIL = [ { type: 'autocomplete', data: 'codigo', renderer: 'currency', - source: COD, strict: true, filter: false}, { type: 'autocomplete', data: ProformDetail.PRODUCT_ID.prop, renderer: 'currency', - source: PRODUCTS, strict: true, filter: false}, { type: 'numeric', data: ProformDetail.QUANTITY.prop, renderer: 'currency' }, { type: 'numeric', data: ProformDetail.PRICE.prop, renderer: 'currency', readOnly: true }, { type: 'numeric', data: ProformDetail.SUB_TOTAL.prop, renderer: 'currency' , readOnly: true }, { type: 'numeric', data: ProformDetail.SALE_DIRECT.prop, renderer: 'currency' }, + { type: 'numeric', data: ProformDetail.SALE_DONATION.prop, renderer: 'currency' }, { type: 'numeric', data: ProformDetail.SALE_EXTERNAL_LIBRARY.prop, renderer: 'currency' }, { type: 'numeric', data: ProformDetail.SALE_EVENT.prop, renderer: 'currency' }, { type: 'numeric', data: ProformDetail.SALE_TEACHER.prop, renderer: 'currency' }, @@ -57,7 +55,7 @@ export const COLUMNS_DETAIL = [ export const COLUMNS_HEADER = [ ProformDetail.ID.name, ProformDetail.DEGREE.name, 'codigo', ProformDetail.PRODUCT_ID.name, ProformDetail.QUANTITY.name, - ProformDetail.PRICE.name, ProformDetail.SUB_TOTAL.name, ProformDetail.SALE_DIRECT.name, + ProformDetail.PRICE.name, ProformDetail.SUB_TOTAL.name, ProformDetail.SALE_DIRECT.name, ProformDetail.SALE_DONATION.name, ProformDetail.SALE_EXTERNAL_LIBRARY.name, ProformDetail.SALE_EVENT.name, ProformDetail.SALE_TEACHER.name, ProformDetail.SALE_INFRASTRUCTURE.name, ProformDetail.SALE_SCHOLARSHIPS.name, ProformDetail.SALE_STAFF.name, ProformDetail.SALE_TRAINING.name, ProformDetail.CAPEX.name, ProformDetail.TOTAL.name diff --git a/src/app/ui/proform-add/proform-add.component.ts b/src/app/ui/proform-add/proform-add.component.ts index ed077ca..f23bd31 100644 --- a/src/app/ui/proform-add/proform-add.component.ts +++ b/src/app/ui/proform-add/proform-add.component.ts @@ -119,6 +119,7 @@ export class ProformAddComponent implements OnInit { { type: 'numeric', data: ProformDetail.PRICE.prop, renderer: 'currency' }, { type: 'numeric', data: ProformDetail.SUB_TOTAL.prop, renderer: 'currency' , readOnly: true }, { type: 'numeric', data: ProformDetail.SALE_DIRECT.prop, renderer: 'currency' }, + { type: 'numeric', data: ProformDetail.SALE_DONATION.prop, renderer: 'currency' }, { type: 'numeric', data: ProformDetail.SALE_EXTERNAL_LIBRARY.prop, renderer: 'currency' }, { type: 'numeric', data: ProformDetail.SALE_EVENT.prop, renderer: 'currency' }, { type: 'numeric', data: ProformDetail.SALE_TEACHER.prop, renderer: 'currency' }, @@ -520,6 +521,7 @@ export class ProformAddComponent implements OnInit { quantity: 0, subtotal:0, sale_direct: 0, + sale_donation: 0, sale_external_library: 0, sale_event: 0, sale_teacher: 0, @@ -536,6 +538,7 @@ export class ProformAddComponent implements OnInit { self.datasetSummary.subtotal = Number(self.datasetSummary.subtotal) + value['subtotal']; self.datasetSummary.total = Number(self.datasetSummary.total) + value['total']; self.datasetSummary.sale_direct = (Number(self.datasetSummary.subtotal) * value['sale_direct'] / 100) as any; + self.datasetSummary.sale_donation = (Number(self.datasetSummary.subtotal) * value['sale_donation'] / 100) as any; }); } diff --git a/src/app/ui/proform-check/model/proformColumns.model.ts b/src/app/ui/proform-check/model/proformColumns.model.ts new file mode 100644 index 0000000..3b78b8a --- /dev/null +++ b/src/app/ui/proform-check/model/proformColumns.model.ts @@ -0,0 +1,40 @@ + +import { FormlyFieldConfig, FieldType } from '@ngx-formly/core'; +import { Proform, ProformDetail } from '../../../app.keys'; +import { of } from 'rxjs'; + + +export const COLUMNS_DETAIL_PROFORM = [ + {field: ProformDetail.ID.prop, headerName: ProformDetail.ID.name, resizable: true, width: 60 }, + {field: ProformDetail.DEGREE.prop, headerName: ProformDetail.DEGREE.name, resizable: true, width: 100 }, + {field: ProformDetail.PRODUCT_ID.prop, headerName: ProformDetail.PRODUCT_ID.name, resizable: true, width: 400 }, + {field: 'codigo', headerName: 'Codigo Producto', resizable: true, width: 400 }, + {field: ProformDetail.QUANTITY.prop, headerName: ProformDetail.QUANTITY.name, resizable: true, width: 120}, + {field: ProformDetail.QUANTITY_CHECK.prop, headerName: ProformDetail.QUANTITY_CHECK.name, resizable: true, width: 120} + ]; + +export const COLUMNS_DETAIL = [ + { data: ProformDetail.ID.prop, readOnly: true }, + { type: 'text', data: ProformDetail.DEGREE.prop, }, + { type: 'autocomplete', + data: 'codigo', + renderer: 'currency', + strict: true, + filter: false}, + { type: 'autocomplete', + data: ProformDetail.PRODUCT_ID.prop, + renderer: 'currency', + strict: true, + filter: false}, + { type: 'numeric', data: ProformDetail.QUANTITY.prop, renderer: 'currency' }, + { type: 'numeric', data: ProformDetail.QUANTITY_CHECK.prop, renderer: 'currency' }, +] + +export const COLUMNS_HEADER = [ + ProformDetail.ID.name, ProformDetail.DEGREE.name, 'codigo', ProformDetail.PRODUCT_ID.name, ProformDetail.QUANTITY.name, + ProformDetail.QUANTITY_CHECK.name +]; + + + + \ No newline at end of file diff --git a/src/app/ui/proform-check/proform-check.component.html b/src/app/ui/proform-check/proform-check.component.html new file mode 100644 index 0000000..9964b89 --- /dev/null +++ b/src/app/ui/proform-check/proform-check.component.html @@ -0,0 +1,48 @@ + + +
    +
    +
    +
    +
    + +
    +
    +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    +
    +
    + + + +
    +
    +
    +
    +
    +
    + +
    +
    + +
    +
    +
    + +
    +
    +
    + + diff --git a/src/app/ui/proform-check/proform-check.component.scss b/src/app/ui/proform-check/proform-check.component.scss new file mode 100644 index 0000000..e2b5c00 --- /dev/null +++ b/src/app/ui/proform-check/proform-check.component.scss @@ -0,0 +1,47 @@ + + +body { + padding-left: 16px; + padding-right: 16px; + } + .display-flex { + display: flex; + } + + .flex-1 { + flex: 1; + } + + .flex-2 { + flex: 2; + } + + .flex-3 { + flex: 3; + } + + .flex-4 { + flex: 4; + } + + .flex-5 { + flex: 5; + } + + .flex-6 { + flex: 6; + } + + [class*="flex-"] { + padding-left: 10px; + padding-right: 10px; + } + + [class*="flex-"]:first-child { + padding-left: 0; + } + + [class*="flex-"]:nth-last-child(2) { + padding-right: 0; + } + \ No newline at end of file diff --git a/src/app/ui/proform-check/proform-check.component.spec.ts b/src/app/ui/proform-check/proform-check.component.spec.ts new file mode 100644 index 0000000..50876f9 --- /dev/null +++ b/src/app/ui/proform-check/proform-check.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ProformCheckComponent } from './proform-check.component'; + +describe('ProformCheckComponent', () => { + let component: ProformCheckComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ ProformCheckComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(ProformCheckComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/ui/proform-check/proform-check.component.ts b/src/app/ui/proform-check/proform-check.component.ts new file mode 100644 index 0000000..6ee1283 --- /dev/null +++ b/src/app/ui/proform-check/proform-check.component.ts @@ -0,0 +1,588 @@ +import { Component, OnInit, ViewChild, ElementRef, ChangeDetectorRef, ChangeDetectionStrategy } from '@angular/core'; +import { FormGroup } from '@angular/forms'; +import { ProjectComponent } from '../../shared/components/project/project.component'; +import { GridComponent } from '../../shared/components/grid/grid.component'; +import { FormlyFormOptions, FormlyFieldConfig } from '@ngx-formly/core'; +import { COLUMNS_DETAIL_PROFORM, COLUMNS_DETAIL, COLUMNS_HEADER } from './model/proformColumns.model'; +import { Proform, TypeClientSale, Agreement, AppStatusForm, TypeRegion, ProformDetail } from 'src/app/app.keys'; +import { ExcelExportService } from 'src/app/shared/service/export-excel.service'; +import * as _ from 'lodash'; +import { of as observableOf, of } from 'rxjs'; +import { ActivatedRoute } from '@angular/router'; +import { GridRecord, IProform, MODEL_DETAIL, PROFORM_SUMMARY, MODEL_DETAIL_SAVE } from 'src/app/app.type'; +import Handsontable from 'handsontable'; +import { ProformService } from '../../shared/service/proform.service'; +import { Router } from '@angular/router'; +import { ProductService } from 'src/app/shared/service/product.service'; +import { SetLeftFeature } from 'ag-grid-community'; +import { UtilsService } from 'src/app/shared/service/utils.service'; +import { map, switchMap } from 'rxjs/operators'; +import { NgxUiLoaderService } from 'ngx-ui-loader'; + +@Component({ + selector: 'app-proform-check', + templateUrl: './proform-check.component.html', + styleUrls: ['./proform-check.component.scss'] +}) +export class ProformCheckComponent implements OnInit { + + + @ViewChild(ProjectComponent, {static: true}) child: ProjectComponent; + @ViewChild('container') container: ElementRef; + + + public loaderProjectForm = 'loader-list-proform'; + + public userData: any; + public productCod: any[] = []; + public productDescription: any[] = []; + + public data: any; + public dataOfBank: any[] = []; + public dataset: any[] = []; + public datasetSummary: PROFORM_SUMMARY ; + public dataTransform: any[]; + public dataTransformTempo: any[]; + public gridColumns = COLUMNS_DETAIL_PROFORM; + public columnsGrid: any; // = COLUMNS_DETAIL; + public columnsHeader = COLUMNS_HEADER; + public enabledTitle: boolean; + public allowExcelExport: boolean; + public condition: string; + public enableEdit: boolean; + public validation: string; + public defaultColDefVal: any; + public dataService: any; + public dataProduct: any; + public dataProformId; + public editProform: boolean = false; + public proformId: any; + public model: any = {}; + currentDate: {}; + + constructor( + private excelExportService: ExcelExportService, + private route: ActivatedRoute, + private proformService: ProformService, + private productService: ProductService, + private router: Router, + private cd : ChangeDetectorRef, + private utilsService: UtilsService, + private loaderService: NgxUiLoaderService, + ) { + const self = this; + + this.getDataProduct().subscribe(data => { + self.dataProduct = data; + _.forEach(self.dataProduct, function(value, key) { + _.forEach(value, function(valueProduct, keyProduct) { + if ( keyProduct === 'description' ) { + self.productDescription.push(valueProduct); + } + if ( keyProduct === 'cod' ) { + self.productCod.push(valueProduct); + } + + }); + }); + + }); + } + + + + form = new FormGroup({}); + + + options = {}; + + + public formFields: FormlyFieldConfig[] = [ + { + className: 'section-label', + template: '

    Editar de Proforma

    Datos Generales:
    ', + }, + { + fieldGroupClassName: 'row', + fieldGroup: [ + { + className: 'col-2', + type: 'input', + key: Proform.ID.prop, + defaultValue: this.proformId, + templateOptions: { + label: Proform.ID.name, + }, + expressionProperties: { + 'templateOptions.disabled': '!model.text', + }, + }, + { + key: Proform.STATUS.prop, + type: 'input', + templateOptions: { + label: Proform.TYPE_CLIENT_SALE.name, + }, + hideExpression: '!model.name', + }, + { + key: Proform.STATE_NUMBER.prop, + type: 'input', + templateOptions: { + label: Proform.STATE_NUMBER.name, + }, + hideExpression: '!model.name', + }, + { + className: 'col-2', + type: 'input', + key: Proform.NUMBER_PROFORM.prop, + templateOptions: { + label: Proform.NUMBER_PROFORM.name, + required: true + }, + expressionProperties: { + 'templateOptions.disabled': '!model.text', + }, + }, + { + className: 'col-3', + type: 'input', + key: Proform.USER_ID.prop, + templateOptions: { + label: Proform.USER_ID.name, + required: true, + }, + expressionProperties: { + 'templateOptions.disabled': '!model.text', + }, + }, + { + type: 'input', + key: Proform.DATE_PROFORM.prop, + className: 'col-sm-2', + defaultValue: this.currentDate, + templateOptions: { + type: 'date', + label: Proform.DATE_PROFORM.name , + }, + expressionProperties: { + 'templateOptions.disabled': '!model.text', + } + }, + { + type: 'input', + key: Proform.DATE_DELIVERY.prop, + className: 'col-sm-2', + defaultValue: new Date(), + templateOptions: { + type: 'date', + label: Proform.DATE_DELIVERY.name, + }, + expressionProperties: { + 'templateOptions.disabled': '!model.text', + } + }, + ], + }, + { + className: 'section-label', + template: '
    Datos del Colegio y del Cliente
    ', + }, + { + fieldGroupClassName: 'row', + fieldGroup: [ + { + className: 'col-4', + type: 'input', + key: Proform.COLLEGE_ID.prop, + templateOptions: { + label: Proform.COLLEGE_ID.name, + }, + expressionProperties: { + 'templateOptions.disabled': '!model.text', + } + }, + { + className: 'col-3', + type: 'select', + key: Proform.CLIENT_ID.prop, + templateOptions: { + label: Proform.CLIENT_ID.name, + valueProp: 'id', + labelProp: 'name', + required: true, + //options: _.sortBy(clientes, "label"), + }, + lifecycle: { + onInit: (form, field) => { + this.utilsService + .getClientsAll() + .pipe() + .subscribe(data => { + let dataClient: any[] = []; + _.forEach(data, function(value, key) { + dataClient.push({'id': value['id'], 'name': value['codClient'] + ' - ' + value['name'], 'codClient': value['codClient']}); + }); + field.templateOptions.options = _.sortBy(dataClient, "codClient"); + }); + } + }, + expressionProperties: { + 'templateOptions.disabled': '!model.text', + } + }, + { + className: 'col-2', + type: 'input', + key: Proform.TYPE_CLIENT_SALE.prop, + templateOptions: { + label: Proform.TYPE_CLIENT_SALE.name, + }, + expressionProperties: { + 'templateOptions.disabled': '!model.text', + } + }, + { + className: 'col-2', + type: 'input', + key: Proform.AGREEMENT.prop, + templateOptions: { + label: Proform.AGREEMENT.name, + }, + expressionProperties: { + 'templateOptions.disabled': '!model.text', + } + }, + ], + }, + { + fieldGroupClassName: 'row', + fieldGroup: [ + + + + ], + + }, + ]; + + ngOnInit() { + this.loaderService.startLoader(this.loaderProjectForm); + this.enabledTitle = false; + this.allowExcelExport = false; + this.currentDate = new Date(); + this.proformId = this.route.snapshot.paramMap.get("id"); + + this.columnsGrid = [ + { data: ProformDetail.ID.prop, readOnly: true, headerName: ProformDetail.ID.name, field: ProformDetail.ID.prop }, + { type: 'text', data: ProformDetail.DEGREE.prop, readOnly: true, headerName: ProformDetail.DEGREE.name, field: ProformDetail.DEGREE.prop }, + { type: 'autocomplete', + data: 'codigo', + readOnly: true, + renderer: 'currency', + source: this.productCod, + strict: true, + filter: false, headerName: 'Código', field: 'codigo'}, + { type: 'autocomplete', + data: ProformDetail.PRODUCT_ID.prop, + readOnly: true, + renderer: 'currency', + source: this.productDescription, + strict: true, + filter: false, headerName: ProformDetail.PRODUCT_ID.name, field: ProformDetail.PRODUCT_ID.prop, }, + { type: 'numeric', data: ProformDetail.QUANTITY.prop, renderer: 'currency', readOnly: true, headerName: ProformDetail.QUANTITY.name, field: ProformDetail.QUANTITY.prop }, + { type: 'numeric', data: ProformDetail.QUANTITY_CHECK.prop, renderer: 'currency' , headerName: ProformDetail.QUANTITY_CHECK.name, field: ProformDetail.QUANTITY_CHECK.prop }, + ] + + if (!this.enableEdit){ + this.validation = '!model.text'; + } else { + this.validation = 'model.text'; + } + + this.defaultColDefVal = { + editable: true, + resizable: true + }; + + const self = this; + //self.dataset = []; + //self.dataOfBank = []; + +/* + self.data = dataVal; + self.dataOfBank = dataVal; + for (let value = 0; value < self.dataOfBank.length; value++) { + let row = self.dataOfBank[value]; + self.dataset.push(row); + }; +*/ + if( _.size(self.dataset) === 0 ) { + this.getDataById(Number(this.proformId)).subscribe( data => { + self.data = data; + self.model = { + "id":data['id'], + "number_proform": data['number_proform'], + "user_id":data['user']['userName'], + "college_id": data['college']['codSantillana'] + ' - ' + data['college']['name'], + "client_id":data['client_id'], + "date_proform": new Date(data['date_proform']).getFullYear() + '-' + _.padStart(new Date(data['date_proform']).getMonth().toString(), 2, '0') + '-' + _.padStart(new Date(data['date_proform']).getDate().toString(), 2, '0'), + "date_delivery": new Date(data['date_delivery']).getFullYear() + '-' + _.padStart(new Date(data['date_delivery']).getMonth().toString(), 2, '0') + '-' + _.padStart(new Date(data['date_delivery']).getDate().toString(), 2, '0'), + "type_client_sale": data['type_client_sale'], + "agreement": data['agreement'] + }; + + self.dataTransform = data['proformDetail']; + this.productService.getProductByRegion(TypeRegion.SIERRA).subscribe(data => { + if( _.size(self.dataTransform) > 0 ) { + for (let value = 0; value < self.dataTransform.length; value++) { + let row = _.pick(this.dataTransform[value], _.keys(MODEL_DETAIL) ); + + let rowId = row['product_id']; + let descount = Number(row['sale_direct']) + Number(row['sale_donation']) + Number(row['sale_external_library']) + Number(row['sale_event']) + Number(row['sale_teacher']) + Number(row['sale_infrastructure']) + Number(row['sale_scholarships']) + Number(row['sale_staff']) + Number(row['sale_training'])+ Number(row['capex']); + row['codigo'] = self.matchProductCodById(rowId, data); + row['product_id'] = self.matchProductDescriptionById(rowId, data); + row['subtotal'] = Number(row['quantity']) * Number(row['price']) + row['total'] = Number(row['subtotal']) - Number(row['subtotal']) * descount / 100; + //let row = self.dataOfBank[value]; + self.dataset.push(row); + }; + } + + }); + + + }); + } + + window.scrollTo(0, 0); + this.form.enable(); + setTimeout(() => { + this.loaderService.stopLoader('loader-list-proform'); + }, 2500); + + + + this.cd.detectChanges(); + + } + + public getDataProduct() { + return this.productService.getProductByRegion(TypeRegion.SIERRA); + } + +/** + * Export Excel + * @param {name, gridColumns, data} + * + */ + public onExportExcel(excelData): any { + if (!_.isNil(excelData.data) && !_.isEmpty(excelData.data)) { + this.excelExportService.generateExcelFromJson( + excelData.name, + excelData.gridColumns, + excelData.data + ); + } + } + + public save() { + if (this.form.valid) { + this.model['id'] = Number(this.model['id']); + this.model['date_delivery'] = new Date(this.model['date_delivery']).toISOString(); + this.model['date_proform'] = new Date(this.model['date_proform']).toISOString(); + this.model['user_id'] = Number(this.model['user_id']); + this.model['college_id'] = Number(this.model['college_id']); + this.model['client_id'] = Number(this.model['client_id']); + this.model['state_number'] = 0; + this.model['status'] = AppStatusForm.active; + + } + + if (!this.validateFields()) { + return; + } + + for (const row of this.dataset) { + row['product_id'] = this.matchProduct(row['codigo'], this.dataProduct); + } + + let grid = _.cloneDeep(this.dataset); + let objTemp =[]; + + for( let obj of grid ) { + objTemp.push(_.pick(obj, _.keys(MODEL_DETAIL_SAVE) )); + } + + this.proformService.updateProformDetail(this.model['id'].toString(), _.replace(JSON.stringify(objTemp), '\r\n', 0)).subscribe(); + alert('Se ha guardado la Proforma ' + this.model['id'].toString() + ' correctamente '); + this.router.navigate(['/']); + + } + + public validateFields (): any { + + let grid = _.cloneDeep(this.dataset); + + if ( _.size(grid) <= 0 ) { + alert('Antes de guardar debe ingresar el detalle de los productos'); + return false; + } + + if ( _.isNil(this.model['client_id']) || _.isNaN(this.model['client_id']) ) { + this.model['client_id'] = null; + } + + for (const row of grid) { + if ( !_.isNil(row['codigo'])) { + if( _.isNil(this.matchProduct(row['codigo'], this.dataProduct)) ) { + alert('No existe el producto ' + row['product_id']); + return false; + } + } else { + alert('No existe el código del producto ' + row['cod']); + return false; + } + + if ( Number(row['quantity_check']) < 0 ) { + alert('El producto ' + row['product_id'] + ' no puede sere menor a 0'); + return false; + } + + if ( Number(row['quantity_check']) > Number(row['quantity']) ) { + alert('El producto ' + row['product_id'] + ' no puede sere mayor que el producto proformado'); + return false; + } + + + } + + return true; + } + + + + public onChange(data: GridRecord[]): void { + + } + + public close() { + this.router.navigate(['/']); + } + + public exportExcel() { + this.excelExportService.generateExcelWithFormat( + "Proforma", + "PROFORMA DE VENTAS", + this.data, + this.columnsGrid, + this.dataset, + this.datasetSummary + ); + } + + public matchProduct(codigo: string, product: any[]): number | undefined { + + let productObj = _.find(product, (x) => x.cod === codigo); + if (_.isNil(productObj)) { + return null; + } + return productObj.id; + + } + + + public matchProductCodById(id: any, product: any[]): number | undefined { + let productObj = _.find(product, (x) => x.id === Number(id)); + if (_.isNil(productObj)) { + return null; + } + return productObj.cod; + + } + + public matchProductDescriptionById(id: any, product: any[]): number | undefined { + let productObj = _.find(product, (x) => x.id === Number(id)); + if (_.isNil(productObj)) { + return null; + } + return productObj.description; + + } + + public getDataById(id: any) { + + return this.proformService.getProformById(Number(id)).pipe( + switchMap(params => { return params } ) + ); +/* + this.proformService.getProformById(Number(id)).subscribe( params => { + self.data = params[0]['proformDetail']; + + }); + +*/ + } + + public edit() { + this.loaderService.startLoader('loader-list-proform'); + const self = this; + this.editProform = true; + let tempoData:any; + + window.scrollTo(0, 0); + this.form.enable(); + setTimeout(() => { + this.loaderService.stopLoader('loader-list-proform'); + }, 1000); + + const idProform = (document.getElementById("txtProforma")).value; +/* + this.getDataById(Number(idProform)).subscribe( data => { + self.dataTransform = data['proformDetail']; + if( _.size(self.dataTransform) > 0 ) { + for (let value = 0; value < self.dataTransform.length; value++) { + let row = _.pick(this.dataTransform[value], _.keys(MODEL_DETAIL) ); + //let row = self.dataOfBank[value]; + self.dataset.push(row); + }; + } + }); +*/ + + //this.ngOnInit(); + + + /* + const idProform = 45; + + this.proformService.getProformById(Number(idProform)).subscribe( params => { + this.data = params[0]['proformDetail']; + const proformDetail : any [] = params[0]['proformDetail']; + + + etb.data = proformDetail; + etb.dataOfBank = proformDetail; + tempoData = proformDetail; + + for (let value = 0; value < etb.dataOfBank.length; value++) { + let row = _.pick(etb.dataOfBank[value], _.keys(MODEL_DETAIL) ); + etb.dataset.push(row); + }; + + }); + console.log('entro', etb.dataset); + + this.data = null; + this.data = etb.dataset; + + return this.data; + //this.dataset = this.data; + + //this.ngOnInit(); + */ + } + + +} diff --git a/src/app/ui/proform-edit/model/proformColumns.model.ts b/src/app/ui/proform-edit/model/proformColumns.model.ts index 38d93ad..f734209 100644 --- a/src/app/ui/proform-edit/model/proformColumns.model.ts +++ b/src/app/ui/proform-edit/model/proformColumns.model.ts @@ -7,13 +7,14 @@ import { COD } from '../../proform-add/product'; export const COLUMNS_DETAIL_PROFORM = [ {field: ProformDetail.ID.prop, headerName: ProformDetail.ID.name, resizable: true, width: 60 }, - {field: ProformDetail.DEGREE.prop, headerName: ProformDetail.DEGREE.name, resizable: true, width: 100 }, //, cellRenderer: 'selectionRender' + {field: ProformDetail.DEGREE.prop, headerName: ProformDetail.DEGREE.name, resizable: true, width: 100 }, {field: ProformDetail.PRODUCT_ID.prop, headerName: ProformDetail.PRODUCT_ID.name, resizable: true, width: 400 }, {field: 'codigo', headerName: 'Codigo Producto', resizable: true, width: 400 }, {field: ProformDetail.QUANTITY.prop, headerName: ProformDetail.QUANTITY.name, resizable: true, width: 100}, {field: ProformDetail.PRICE.prop, headerName: ProformDetail.PRICE.name, resizable: true, width: 100}, {field: ProformDetail.SUB_TOTAL.prop, headerName: ProformDetail.SUB_TOTAL.name, resizable: true, width: 100}, {field: ProformDetail.SALE_DIRECT.prop, headerName: ProformDetail.SALE_DIRECT.name, resizable: true, width: 100}, + {field: ProformDetail.SALE_DONATION.prop, headerName: ProformDetail.SALE_DONATION.name, resizable: true, width: 100}, {field: ProformDetail.SALE_EXTERNAL_LIBRARY.prop, headerName: ProformDetail.SALE_EXTERNAL_LIBRARY.name, resizable: true, width: 100}, {field: ProformDetail.SALE_EVENT.prop, headerName: ProformDetail.SALE_EVENT.name, resizable: true, width: 100}, {field: ProformDetail.SALE_TEACHER.prop, headerName: ProformDetail.SALE_TEACHER.name, resizable: true, width: 100}, @@ -44,6 +45,7 @@ export const COLUMNS_DETAIL = [ { type: 'numeric', data: ProformDetail.PRICE.prop, renderer: 'currency' }, { type: 'numeric', data: ProformDetail.SUB_TOTAL.prop, renderer: 'currency' , readOnly: true }, { type: 'numeric', data: ProformDetail.SALE_DIRECT.prop, renderer: 'currency' }, + { type: 'numeric', data: ProformDetail.SALE_DONATION.prop, renderer: 'currency' }, { type: 'numeric', data: ProformDetail.SALE_EXTERNAL_LIBRARY.prop, renderer: 'currency' }, { type: 'numeric', data: ProformDetail.SALE_EVENT.prop, renderer: 'currency' }, { type: 'numeric', data: ProformDetail.SALE_TEACHER.prop, renderer: 'currency' }, @@ -56,7 +58,7 @@ export const COLUMNS_DETAIL = [ export const COLUMNS_HEADER = [ ProformDetail.ID.name, ProformDetail.DEGREE.name, 'codigo', ProformDetail.PRODUCT_ID.name, ProformDetail.QUANTITY.name, - ProformDetail.PRICE.name, ProformDetail.SUB_TOTAL.name, ProformDetail.SALE_DIRECT.name, + ProformDetail.PRICE.name, ProformDetail.SUB_TOTAL.name, ProformDetail.SALE_DIRECT.name, ProformDetail.SALE_DONATION.name, ProformDetail.SALE_EXTERNAL_LIBRARY.name, ProformDetail.SALE_EVENT.name, ProformDetail.SALE_TEACHER.name, ProformDetail.SALE_INFRASTRUCTURE.name, ProformDetail.SALE_SCHOLARSHIPS.name, ProformDetail.SALE_STAFF.name, ProformDetail.SALE_TRAINING.name, ProformDetail.CAPEX.name, ProformDetail.TOTAL.name diff --git a/src/app/ui/proform-edit/proform-edit.component.ts b/src/app/ui/proform-edit/proform-edit.component.ts index 270cb1c..db806c8 100644 --- a/src/app/ui/proform-edit/proform-edit.component.ts +++ b/src/app/ui/proform-edit/proform-edit.component.ts @@ -293,6 +293,7 @@ export class ProformEditComponent implements OnInit { { type: 'numeric', data: ProformDetail.PRICE.prop, renderer: 'currency', headerName: ProformDetail.PRICE.name, field: ProformDetail.PRICE.prop }, { type: 'numeric', data: ProformDetail.SUB_TOTAL.prop, renderer: 'currency' , readOnly: true , headerName: ProformDetail.SUB_TOTAL.name, field: ProformDetail.SUB_TOTAL.prop }, { type: 'numeric', data: ProformDetail.SALE_DIRECT.prop, renderer: 'currency', headerName: ProformDetail.SALE_DIRECT.name, field: ProformDetail.SALE_DIRECT.prop }, + { type: 'numeric', data: ProformDetail.SALE_DONATION.prop, renderer: 'currency', headerName: ProformDetail.SALE_DONATION.name, field: ProformDetail.SALE_DONATION.prop }, { type: 'numeric', data: ProformDetail.SALE_EXTERNAL_LIBRARY.prop, renderer: 'currency', headerName: ProformDetail.SALE_EXTERNAL_LIBRARY.name, field: ProformDetail.SALE_EXTERNAL_LIBRARY.prop }, { type: 'numeric', data: ProformDetail.SALE_EVENT.prop, renderer: 'currency', headerName: ProformDetail.SALE_EVENT.name, field: ProformDetail.SALE_EVENT.prop }, { type: 'numeric', data: ProformDetail.SALE_TEACHER.prop, renderer: 'currency', headerName: ProformDetail.SALE_TEACHER.name, field: ProformDetail.SALE_TEACHER.prop }, @@ -349,7 +350,7 @@ export class ProformEditComponent implements OnInit { let row = _.pick(this.dataTransform[value], _.keys(MODEL_DETAIL) ); let rowId = row['product_id']; - let descount = Number(row['sale_direct']) + Number(row['sale_external_library']) + Number(row['sale_event']) + Number(row['sale_teacher']) + Number(row['sale_infrastructure']) + Number(row['sale_scholarships']) + Number(row['sale_staff']) + Number(row['sale_training'])+ Number(row['capex']); + let descount = Number(row['sale_direct']) + Number(row['sale_donation']) + Number(row['sale_external_library']) + Number(row['sale_event']) + Number(row['sale_teacher']) + Number(row['sale_infrastructure']) + Number(row['sale_scholarships']) + Number(row['sale_staff']) + Number(row['sale_training'])+ Number(row['capex']); row['codigo'] = self.matchProductCodById(rowId, data); row['product_id'] = self.matchProductDescriptionById(rowId, data); row['subtotal'] = Number(row['quantity']) * Number(row['price']) @@ -481,6 +482,7 @@ export class ProformEditComponent implements OnInit { quantity: 0, subtotal:0, sale_direct: 0, + sale_donation: 0, sale_external_library: 0, sale_event: 0, sale_teacher: 0, @@ -498,6 +500,7 @@ export class ProformEditComponent implements OnInit { self.datasetSummary.subtotal = Number(self.datasetSummary.subtotal) + value['subtotal']; self.datasetSummary.total = Number(self.datasetSummary.total) + value['total']; self.datasetSummary.sale_direct = Number(self.datasetSummary.sale_direct) + value['sale_direct']; + self.datasetSummary.sale_donation = Number(self.datasetSummary.sale_donation) + value['sale_donation']; self.datasetSummary.sale_external_library = Number(self.datasetSummary.sale_external_library) + value['sale_external_library']; self.datasetSummary.sale_event = Number(self.datasetSummary.sale_event) + value['sale_event']; self.datasetSummary.sale_teacher = Number(self.datasetSummary.sale_teacher) + value['sale_teacher']; @@ -508,15 +511,16 @@ export class ProformEditComponent implements OnInit { self.datasetSummary.capex = Number(self.datasetSummary.capex) + value['capex']; }); - self.datasetSummary.sale_direct = (Number(self.datasetSummary.sale_direct) / count); - self.datasetSummary.sale_external_library = Number(self.datasetSummary.sale_external_library) / count; - self.datasetSummary.sale_event = Number(self.datasetSummary.sale_event) / count; - self.datasetSummary.sale_teacher = Number(self.datasetSummary.sale_teacher) / count; - self.datasetSummary.sale_infrastructure = Number(self.datasetSummary.sale_infrastructure) / count; - self.datasetSummary.sale_scholarships = Number(self.datasetSummary.sale_scholarships) / count; - self.datasetSummary.sale_staff = Number(self.datasetSummary.sale_staff) / count; - self.datasetSummary.sale_training = Number(self.datasetSummary.sale_training) / count; - self.datasetSummary.capex = Number(self.datasetSummary.capex) / count; + self.datasetSummary.sale_direct = (Number(self.datasetSummary.sale_direct) / count); + self.datasetSummary.sale_donation = (Number(self.datasetSummary.sale_donation) / count); + self.datasetSummary.sale_external_library = Number(self.datasetSummary.sale_external_library) / count; + self.datasetSummary.sale_event = Number(self.datasetSummary.sale_event) / count; + self.datasetSummary.sale_teacher = Number(self.datasetSummary.sale_teacher) / count; + self.datasetSummary.sale_infrastructure = Number(self.datasetSummary.sale_infrastructure) / count; + self.datasetSummary.sale_scholarships = Number(self.datasetSummary.sale_scholarships) / count; + self.datasetSummary.sale_staff = Number(self.datasetSummary.sale_staff) / count; + self.datasetSummary.sale_training = Number(self.datasetSummary.sale_training) / count; + self.datasetSummary.capex = Number(self.datasetSummary.capex) / count; } diff --git a/src/app/ui/proform-list/proform-list.component.html b/src/app/ui/proform-list/proform-list.component.html index 7fe2f3a..09d9e31 100644 --- a/src/app/ui/proform-list/proform-list.component.html +++ b/src/app/ui/proform-list/proform-list.component.html @@ -14,7 +14,8 @@ + (exportExcel)= "onExportExcel($event)" + (projectSelected)= "selectProject($event)"> diff --git a/src/app/ui/proform-state/proform-state.component.html b/src/app/ui/proform-state/proform-state.component.html index 3672b7d..111df02 100644 --- a/src/app/ui/proform-state/proform-state.component.html +++ b/src/app/ui/proform-state/proform-state.component.html @@ -12,7 +12,7 @@ diff --git a/src/app/ui/proform-state/proform-state.component.ts b/src/app/ui/proform-state/proform-state.component.ts index 3965514..f74bcb7 100644 --- a/src/app/ui/proform-state/proform-state.component.ts +++ b/src/app/ui/proform-state/proform-state.component.ts @@ -68,6 +68,10 @@ export class ProformStateComponent implements OnInit { this.router.navigate(['proform-edit', row['data']['id']]); } + public checkProject(row): any { + this.router.navigate(['proform-check', row['data']['id']]); + } + public edit() { const idProform = (document.getElementById("txtProforma")).value; this.router.navigate(['proform-edit', idProform]); diff --git a/src/app/ui/proform-state/proformColumns.ts b/src/app/ui/proform-state/proformColumns.ts index 28fafe1..9b5a207 100644 --- a/src/app/ui/proform-state/proformColumns.ts +++ b/src/app/ui/proform-state/proformColumns.ts @@ -8,6 +8,13 @@ export const COLUMNS_PROFORM = [ colId: 'params', width: 85 }, + { + headerName: ' Entregado', + field: 'value', + cellRenderer: 'checkProjectRenderer', + colId: 'params', + width: 120 + }, { field: Proform.ID.prop, headerName: Proform.ID.name, resizable: true, width: 90 }, { field: Proform.NUMBER_PROFORM.prop, headerName: Proform.NUMBER_PROFORM.name, resizable: true, width: 150 }, { field: Proform.DATE_PROFORM.prop, headerName: Proform.DATE_PROFORM.name, resizable: true, width: 120 }, diff --git a/src/app/ui/ui-routing.module.ts b/src/app/ui/ui-routing.module.ts index 004601b..37b86fd 100644 --- a/src/app/ui/ui-routing.module.ts +++ b/src/app/ui/ui-routing.module.ts @@ -5,12 +5,14 @@ import {USER_ROLES} from '../app.keys'; import { ProformListComponent } from './proform-list/proform-list.component'; import { ProformEditComponent } from './proform-edit/proform-edit.component'; import { ProformStateComponent } from './proform-state/proform-state.component'; +import { ProformCheckComponent } from './proform-check/proform-check.component'; const configurationRoutes: Routes = [ { path: 'proform', component: ProformAddComponent }, { path: 'proform-list', component: ProformListComponent }, { path: 'proform-state', component: ProformStateComponent}, - { path: 'proform-edit/:id', component: ProformEditComponent } + { path: 'proform-edit/:id', component: ProformEditComponent }, + { path: 'proform-check/:id', component: ProformCheckComponent } ]; @NgModule({ imports: [RouterModule.forChild(configurationRoutes)], diff --git a/src/app/ui/ui.module.ts b/src/app/ui/ui.module.ts index 63f73e8..e6f39dc 100644 --- a/src/app/ui/ui.module.ts +++ b/src/app/ui/ui.module.ts @@ -14,6 +14,7 @@ import { NgxUiLoaderModule } from 'ngx-ui-loader'; import { ProformStateComponent } from './proform-state/proform-state.component'; import { ProformOptionsStateComponent } from './proform-state/proform-options-state/proform-options-state.component'; import { NgbDropdownModule, NgbModule } from '@ng-bootstrap/ng-bootstrap'; +import { ProformCheckComponent } from './proform-check/proform-check.component'; @NgModule({ @@ -36,7 +37,7 @@ import { NgbDropdownModule, NgbModule } from '@ng-bootstrap/ng-bootstrap'; NgbModule, NgbDropdownModule ], - declarations: [ProformAddComponent, ProformListComponent, ProformEditComponent, ProformStateComponent, ProformOptionsStateComponent], + declarations: [ProformAddComponent, ProformListComponent, ProformEditComponent, ProformStateComponent, ProformOptionsStateComponent, ProformCheckComponent], providers: [], exports: [ProformAddComponent] })