Skip to content
Open
Show file tree
Hide file tree
Changes from all 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
3 changes: 2 additions & 1 deletion angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@
"cli": {
"schematicCollections": [
"@angular-eslint/schematics"
]
],
"analytics": "8f2e454e-bb27-4eb2-9f14-3bfcadbfaa29"
}
}
38 changes: 38 additions & 0 deletions src/app/actions/equipment/a_equipment_add_quantity.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
import { ApiService } from "src/app/shared/services/apiService/api.service";
import { ViewService } from "src/app/shared/services/viewService/view.service";
import { WizardService } from "src/app/shared/services/wizardService/wizard.service";
import { switchMap, filter, tap, defaultIfEmpty, of } from "rxjs";
import { CID } from "src/app/shared/config/constants.json";

export function a_equipment_add_quantity(vs: ViewService, apis: ApiService, ws: WizardService) {
return ws.create('test').pipe(
tap(() => {
ws.allowSave(() => {
if (ws.getValue('quantity') === '') {
vs.showToast('Quantity is reqired', 'warning');
return false;
}
return true
})
}),
switchMap(() => ws.destroy()),
filter(wizardDestroyed => wizardDestroyed.save),
switchMap(wizardDestroyed => apis.saveRecord(
CID.EQUIPMENT,
wizardDestroyed.savedFields,
{}
)

),
tap(() => {
vs.refresh();

}),
defaultIfEmpty(null)
);
}





1 change: 1 addition & 0 deletions src/app/actions/equipment/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ export * from './a_equipment_type_create';
export * from './a_equipment_type_delete';
export * from './a_equipment_create';
export * from './a_equipment_delete';
export * from './a_equipment_add_quantity';
4 changes: 4 additions & 0 deletions src/app/shared/config/actions.json.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ export const actionsConfig = [
displayName: 'Delete',
actionName: 'deleteEquipment',
},
{
displayName: 'Add quantity',
actionName: 'addQuantityEquipment',
},
]
},
"equipmentTypes": {
Expand Down
4 changes: 2 additions & 2 deletions src/app/shared/config/constants.json.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export const CID = {
EQUIPMENT: "http://localhost:5001/api/v1/Equipments",
EQUIPMENT_TYPE: "http://localhost:5001/api/v1/Equipment/Types"
EQUIPMENT: "http://localhost:5451/api/v1/Equipments",
EQUIPMENT_TYPE: "http://localhost:5451/api/v1/Equipment/Types"
}
19 changes: 19 additions & 0 deletions src/app/shared/config/views/wizard.json.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,25 @@ export const wizardConfig = [
fieldValue: ''
},
]
},
"test": {
title: 'Create quantity type',
fields: [
{
fieldLabel: "Quantity",
fieldType: "number",
fieldName: "quantity",
isClass: false,
classDataUrl: '',
},
],
formBuilderGroupFields: [
{
fieldKey: 'quantity',
fieldValue: ''
},
]
}

}
]
6 changes: 4 additions & 2 deletions src/app/shared/services/actionService/action.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ import {
a_equipment_type_create,
a_equipment_type_delete,
a_equipment_create,
a_equipment_delete
a_equipment_delete,
a_equipment_add_quantity
} from 'src/app/actions/equipment';

@Injectable({
Expand All @@ -33,8 +34,9 @@ export class ActionService {
// EQUIPMENT TYPE
createEquipmentType() { return a_equipment_type_create(this.viewService, this.apiService, this.wizardService) }
deleteEquipmentType() { return a_equipment_type_delete(this.viewService, this.apiService, this.yesNoService) }

// EQUIPMENT
createEquipment() { return a_equipment_create(this.viewService, this.apiService, this.wizardService) }
deleteEquipment() { return a_equipment_delete(this.viewService, this.apiService, this.yesNoService) }
addQuantityEquipment() { return a_equipment_add_quantity(this.viewService, this.apiService, this.wizardService) }
}
2 changes: 1 addition & 1 deletion src/proxy.conf.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"/api": {
"target": "http://localhost:5001",
"target": "http://localhost:5451",
"secure": false
}
}