Merge branch 'dev' into 'feat/delete-structure'
# Conflicts: # src/app/structure-list/components/structure-details/structure-details.component.html # src/app/structure-list/components/structure-details/structure-details.component.ts
Showing
- src/app/footer-form/footer-form.component.html 7 additions, 2 deletionssrc/app/footer-form/footer-form.component.html
- src/app/footer-form/footer-form.component.scss 1 addition, 10 deletionssrc/app/footer-form/footer-form.component.scss
- src/app/form/form.component.html 70 additions, 14 deletionssrc/app/form/form.component.html
- src/app/form/form.component.scss 76 additions, 21 deletionssrc/app/form/form.component.scss
- src/app/form/form.component.ts 224 additions, 85 deletionssrc/app/form/form.component.ts
- src/app/models/structure.model.ts 0 additions, 1 deletionsrc/app/models/structure.model.ts
- src/app/services/structure.service.ts 2 additions, 1 deletionsrc/app/services/structure.service.ts
- src/app/shared/components/hour-picker/hour-picker.component.html 3 additions, 4 deletions.../shared/components/hour-picker/hour-picker.component.html
- src/app/shared/components/hour-picker/hour-picker.component.ts 0 additions, 1 deletion...pp/shared/components/hour-picker/hour-picker.component.ts
- src/app/shared/components/modal-confirmation/modal-confirmation.component.html 2 additions, 2 deletions...ents/modal-confirmation/modal-confirmation.component.html
- src/app/shared/components/modal-confirmation/modal-confirmation.component.scss 41 additions, 8 deletions...ents/modal-confirmation/modal-confirmation.component.scss
- src/app/shared/components/structure-type-picker/structure-type-picker.component.html 1 addition, 1 deletion...tructure-type-picker/structure-type-picker.component.html
- src/app/shared/components/structure-type-picker/structure-type-picker.component.ts 7 additions, 3 deletions.../structure-type-picker/structure-type-picker.component.ts
- src/app/shared/enum/regex.enum.ts 6 additions, 6 deletionssrc/app/shared/enum/regex.enum.ts
- src/app/shared/enum/typeStructure.enum.ts 24 additions, 11 deletionssrc/app/shared/enum/typeStructure.enum.ts
- src/app/structure-list/components/card/card.component.html 1 addition, 1 deletionsrc/app/structure-list/components/card/card.component.html
- src/app/structure-list/components/card/card.component.ts 5 additions, 0 deletionssrc/app/structure-list/components/card/card.component.ts
- src/app/structure-list/components/structure-details/structure-details.component.html 6 additions, 12 deletions...onents/structure-details/structure-details.component.html
- src/app/structure-list/components/structure-details/structure-details.component.ts 7 additions, 20 deletions...mponents/structure-details/structure-details.component.ts
- src/app/structure-list/enum/public.enum.ts 1 addition, 0 deletionssrc/app/structure-list/enum/public.enum.ts
Loading
Please register or sign in to comment