Échantillon |
diff --git a/src/app/modules/colors/pages/list/list.component.ts b/src/app/modules/colors/pages/list/list.component.ts
index 29573c9..355023d 100644
--- a/src/app/modules/colors/pages/list/list.component.ts
+++ b/src/app/modules/colors/pages/list/list.component.ts
@@ -17,7 +17,7 @@ import {Config} from '../../../shared/model/config.model'
})
export class ListComponent extends ErrorHandlingComponent {
recipes: { company: string, recipes: Recipe[] }[] = []
- tableCols = ['name', 'description', 'color', 'gloss', 'sample', 'iconNotApproved', 'buttonView', 'buttonEdit']
+ tableCols = ['name', 'description', 'color', 'sample', 'iconNotApproved', 'buttonView', 'buttonEdit']
searchQuery = ''
panelForcedExpanded = false
hiddenRecipes = []
diff --git a/src/app/modules/configuration/config.ts b/src/app/modules/configuration/config.ts
index b09c42d..5893391 100644
--- a/src/app/modules/configuration/config.ts
+++ b/src/app/modules/configuration/config.ts
@@ -18,6 +18,7 @@ import {ActivatedRoute, Router} from '@angular/router'
import {formatDateTime, getFileUrl, readFile} from '../shared/utils/utils'
import {FormControl, Validators} from '@angular/forms'
import {ConfirmBoxComponent} from '../shared/components/confirm-box/confirm-box.component'
+import {environment} from '../../../environments/environment'
@Directive({
selector: 'cre-config-label'
@@ -149,6 +150,10 @@ export class CreImageConfig extends CreConfig {
updateImage(file: File): any {
readFile(file, (content) => this.updatedImage = content)
}
+
+ get imageUrl(): string {
+ return `${environment.apiUrl}/file?path=${this.configuration.content}`
+ }
}
@Component({
@@ -157,8 +162,8 @@ export class CreImageConfig extends CreConfig {
})
export class CreBoolConfig extends CreConfig {
setConfig(config: Config) {
- super.setConfig(config);
- this.config.control.setValue(config.content === "true")
+ super.setConfig(config)
+ this.config.control.setValue(config.content === 'true')
}
}
diff --git a/src/app/modules/shared/components/inputs/checkbox.html b/src/app/modules/shared/components/inputs/checkbox.html
index dbadabf..54370a5 100644
--- a/src/app/modules/shared/components/inputs/checkbox.html
+++ b/src/app/modules/shared/components/inputs/checkbox.html
@@ -1,3 +1,6 @@
-
- {{label}}
+{{label}}
+
diff --git a/src/app/modules/shared/components/inputs/inputs.module.ts b/src/app/modules/shared/components/inputs/inputs.module.ts
index 17a81fb..23d624e 100644
--- a/src/app/modules/shared/components/inputs/inputs.module.ts
+++ b/src/app/modules/shared/components/inputs/inputs.module.ts
@@ -42,15 +42,16 @@ import {MatCheckboxModule} from '@angular/material/checkbox'
CreButtonsModule,
MatCheckboxModule,
],
- exports: [
- CreInputComponent,
- CreComboBoxComponent,
- CreChipComboBoxComponent,
- CreChipInputComponent,
- CreAutocompleteInputComponent,
- CreFileInputComponent,
- CreBoolConfig
- ]
+ exports: [
+ CreInputComponent,
+ CreComboBoxComponent,
+ CreChipComboBoxComponent,
+ CreChipInputComponent,
+ CreAutocompleteInputComponent,
+ CreFileInputComponent,
+ CreBoolConfig,
+ CreCheckboxInputComponent
+ ]
})
export class CreInputsModule {
}
diff --git a/src/app/modules/shared/components/inputs/inputs.ts b/src/app/modules/shared/components/inputs/inputs.ts
index 62b1dff..9da68cc 100644
--- a/src/app/modules/shared/components/inputs/inputs.ts
+++ b/src/app/modules/shared/components/inputs/inputs.ts
@@ -187,6 +187,9 @@ export class CreChipComboBoxComponent extends CreChipInputComponent implements O
export class CreCheckboxInputComponent {
@Input() label: string
@Input() control: FormControl
+ @Input() checked: boolean
+
+ @Output() checkedChange = new EventEmitter()
}
@Component({
diff --git a/src/app/modules/shared/model/config.model.ts b/src/app/modules/shared/model/config.model.ts
index 2d96d4d..6144c2a 100644
--- a/src/app/modules/shared/model/config.model.ts
+++ b/src/app/modules/shared/model/config.model.ts
@@ -8,6 +8,7 @@ export class Config {
static readonly DATABASE_PASSWORD = 'database.password'
static readonly DATABASE_VERSION = 'database.version.supported'
static readonly TOUCH_UP_KIT_CACHE_PDF = 'touchupkit.pdf.cache'
+ static readonly TOUCH_UP_KIT_EXPIRATION = 'touchupkit.expiration'
static readonly EMERGENCY_MODE = 'env.emergency'
static readonly APP_VERSION = 'env.version'
static readonly JAVA_VERSION = 'env.java.version'
diff --git a/src/app/modules/shared/model/touch-up-kit.model.ts b/src/app/modules/shared/model/touch-up-kit.model.ts
index df625e5..7cf0850 100644
--- a/src/app/modules/shared/model/touch-up-kit.model.ts
+++ b/src/app/modules/shared/model/touch-up-kit.model.ts
@@ -6,6 +6,8 @@ export class TouchUpKit {
public company: string,
public quantity: number,
public shippingDate: string,
+ public completed: boolean,
+ public completionDate: string,
public finish: string[],
public material: string[],
public content: TouchUpKitProduct[]
@@ -18,7 +20,8 @@ export class TouchUpKitProduct {
public id: number,
public name: string,
public description: string | null,
- public quantity: number
+ public quantity: number,
+ public ready: boolean
) {
}
}
diff --git a/src/app/modules/touch-up-kit/components/form.ts b/src/app/modules/touch-up-kit/components/form.ts
index 6340f72..0a77b7f 100644
--- a/src/app/modules/touch-up-kit/components/form.ts
+++ b/src/app/modules/touch-up-kit/components/form.ts
@@ -65,6 +65,8 @@ export class TouchUpKitForm extends SubscribingComponent {
company: this.controls.company.value,
quantity: this.controls.quantity.value,
shippingDate: this.controls.shippingDate.value,
+ completed: false,
+ completionDate: null,
finish: this.selectedFinish,
material: this.selectedMaterial,
content: this.touchUpKitContent
diff --git a/src/app/modules/touch-up-kit/components/product-editor.ts b/src/app/modules/touch-up-kit/components/product-editor.ts
index ea2d840..9ea7c89 100644
--- a/src/app/modules/touch-up-kit/components/product-editor.ts
+++ b/src/app/modules/touch-up-kit/components/product-editor.ts
@@ -51,7 +51,8 @@ export class TouchUpKitProductEditor implements OnInit {
id: null,
name: '',
description: '',
- quantity: 1
+ quantity: 1,
+ ready: false
}
}
}
diff --git a/src/app/modules/touch-up-kit/pages/banner.html b/src/app/modules/touch-up-kit/pages/banner.html
index 4da19bc..531f9dc 100644
--- a/src/app/modules/touch-up-kit/pages/banner.html
+++ b/src/app/modules/touch-up-kit/pages/banner.html
@@ -14,6 +14,7 @@
Matériel: {{material}}
+ Complété le {{completionDate}}
diff --git a/src/app/modules/touch-up-kit/pages/details.html b/src/app/modules/touch-up-kit/pages/details.html
index 99bbb6c..bb5b358 100644
--- a/src/app/modules/touch-up-kit/pages/details.html
+++ b/src/app/modules/touch-up-kit/pages/details.html
@@ -1,10 +1,18 @@
-
-
-
-
+
+
+ Retour
+ PDF
+
+
+ Enregistrer
+
+ Compléter
+
+
+
@@ -24,5 +32,18 @@
Quantité |
{{product.quantity}} |
+
+
+ Prêt |
+
+
+ |
+
+
+
+
diff --git a/src/app/modules/touch-up-kit/pages/list.html b/src/app/modules/touch-up-kit/pages/list.html
index e5fc496..1cb372b 100644
--- a/src/app/modules/touch-up-kit/pages/list.html
+++ b/src/app/modules/touch-up-kit/pages/list.html
@@ -5,7 +5,7 @@
-
+
Project |
{{touchUpKit.project}} |
@@ -51,3 +51,58 @@
|
+
+