Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/funds fixing #275

Merged
merged 4 commits into from
Dec 12, 2019
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export class ModificacionApropiacionComponent implements OnInit {
{ value: 'apropiacion', label: 'Apropiación' },
{ value: 'fuente', label: 'Fuente de Financiamiento' }
];
option = { value:'', label: ''};
option = { value: '', label: ''};
@Output() saved: EventEmitter<boolean> = new EventEmitter();

ngOnInit() {
Expand Down Expand Up @@ -96,6 +96,7 @@ export class ModificacionApropiacionComponent implements OnInit {
break;
case 1:
console.info($event);
break;
case 2:
this.setSteppValidator(this.checkAfectationFinalData);
break;
Expand Down Expand Up @@ -138,6 +139,4 @@ export class ModificacionApropiacionComponent implements OnInit {
public nextStep() {
this.stepper.next();
}


}
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,8 @@
class="mod-registration-input-item"
>
<mat-label>{{ "GLOBAL.tipo" | translate }}</mat-label>
<mat-select formControlName="modType" [(value)]="selectedType">
<mat-option>
--Seleccionar--
</mat-option>
<mat-select formControlName="modType" [(value)]="selectedType" placeholder=" --Seleccionar--">

<mat-option
*ngFor="let modType of modTypes"
[value]="modType"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,17 @@ export class SetModificacionApropiacionComponent implements OnInit {
await this.cleanData();
this.aprAfectation = [];
this.modHelper.getModTypes().subscribe((res) => {
this.modTypes = res;
this.modTypes = res.filter(this.movApropiaciones) ;
});

}


public movApropiaciones( movimiento ) {
const acronimo = movimiento.Acronimo
if ( 'adicion' === acronimo ||
'suspension' === acronimo ||
'traslado' === acronimo ||
'reduccion' === acronimo ) return true;
}

public accountSelection(account: string) {
this.accountTypeSelected = account;
Expand All @@ -73,7 +78,6 @@ export class SetModificacionApropiacionComponent implements OnInit {
this.cnCreditAccount = $event;
this.modValueForm.controls['cnCredAccount'].patchValue(`${this.cnCreditAccount.Codigo} / ${this.cnCreditAccount.Nombre}`);
break;

default:
break;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,7 @@ export class SetModificacionFuenteComponent implements OnInit {
this.modValueForm.controls['modType'].valueChanges.subscribe((selected: TypeGeneral) => {
if (selected.Parametros) {
selected.Parametros = JSON.parse(selected.Parametros);
console.info(selected.Parametros);
}
console.info(selected);
this.modTypeSelected = selected;
if (this.modTypeSelected) {
if (selected.Parametros['MovimientoDestino']) {
Expand Down
43 changes: 0 additions & 43 deletions src/environments/environment.ts

This file was deleted.