From f4396e31d2c363bf40b6374faebae486e346c398 Mon Sep 17 00:00:00 2001
From: Augustin Leconte <ext.sopra.aleconte@grandlyon.com>
Date: Thu, 9 Dec 2021 17:12:39 +0100
Subject: [PATCH 1/2] add venteMaterielPrixSolidaire in equipement when
creating struc
---
src/app/form/structure-form/form.component.html | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/app/form/structure-form/form.component.html b/src/app/form/structure-form/form.component.html
index 455d10040..05b19ce54 100644
--- a/src/app/form/structure-form/form.component.html
+++ b/src/app/form/structure-form/form.component.html
@@ -1026,9 +1026,12 @@
<ng-container *ngFor="let equipment of equipmentsAndServices">
<app-checkbox-form
*ngIf="
- ['donDeMateriels', 'reconditionnementsDeMateriel', 'accesLivresInformatiques'].includes(
- equipment.module.id
- )
+ [
+ 'donDeMateriels',
+ 'reconditionnementsDeMateriel',
+ 'accesLivresInformatiques',
+ 'venteMaterielPrixSolidaire'
+ ].includes(equipment.module.id)
"
[isChecked]="isInArray(equipment.module.id, 'equipmentsAndServices')"
[text]="equipment.module.text"
--
GitLab
From 254bb031fc9c4ba6f352f9dbb150e45cf53c41a4 Mon Sep 17 00:00:00 2001
From: Augustin Leconte <ext.sopra.aleconte@grandlyon.com>
Date: Tue, 14 Dec 2021 14:35:37 +0100
Subject: [PATCH 2/2] feat: add svg icon
---
src/app/form/structure-form/form.component.ts | 2 +-
src/assets/form/sprite.svg | 5 +++++
src/assets/form/venteMaterielPrixSolidaire.svg | 5 +++++
src/assets/ico/sprite.svg | 1 -
4 files changed, 11 insertions(+), 2 deletions(-)
create mode 100644 src/assets/form/venteMaterielPrixSolidaire.svg
diff --git a/src/app/form/structure-form/form.component.ts b/src/app/form/structure-form/form.component.ts
index 93dbede12..67f02fbd7 100644
--- a/src/app/form/structure-form/form.component.ts
+++ b/src/app/form/structure-form/form.component.ts
@@ -108,7 +108,7 @@ export class FormComponent implements OnInit {
});
} else if (history.state.newUser) {
this.isClaimMode = true;
- // Handle join strucutre, the case is very similar to claim
+ // Handle join structure, the case is very similar to claim
if (history.state.isJoin) {
this.isJoinMode = true;
}
diff --git a/src/assets/form/sprite.svg b/src/assets/form/sprite.svg
index 806ec0677..356b83c16 100644
--- a/src/assets/form/sprite.svg
+++ b/src/assets/form/sprite.svg
@@ -376,6 +376,11 @@
<path d="M17.1672 10.9313C17.016 9.60345 15.8455 8.65494 14.5527 8.81268C13.6717 8.9202 12.9613 9.51373 12.646 10.3012C12.4923 10.5803 12.4335 10.897 12.4695 11.2047C12.469 11.303 12.4743 11.4025 12.4857 11.5026L13.7476 22.5855C13.8759 23.7123 14.749 24.595 15.8478 24.7088L26.2094 25.7814L29.5025 33.4144C30.0295 34.6361 31.4215 35.1857 32.6117 34.6419C33.8018 34.0983 34.3393 32.6672 33.8122 31.4455L29.9653 22.5289C29.6229 21.7351 28.8923 21.1915 28.051 21.1044L18.2096 20.0856L17.8595 17.0114L18.0599 17.21L19.0954 16.1816L18.0599 17.21C18.4504 17.5973 18.9639 17.8388 19.5137 17.8938L23.7649 18.3188C24.6044 18.4027 25.3548 17.7952 25.4409 16.9619C25.527 16.1286 24.9163 15.3851 24.0767 15.3012L20.0573 14.8993L17.3087 12.1738L17.1672 10.9313Z" fill="#348899"/>
</symbol>
+<symbol id="venteMaterielPrixSolidaire" viewBox="0 0 35 35" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" stroke="none" clip-rule="evenodd" d="M23.492 12.1384C23.6409 12.0504 23.8145 12 24 12L27.7415 12C28.005 12 28.2578 12.104 28.4451 12.2894L34.1522 17.9404C34.546 18.3303 34.5476 18.9662 34.1557 19.3581L30.3697 23.1441C29.978 23.5357 29.3427 23.5345 28.9526 23.1412L23.29 17.4329C23.1042 17.2456 23 16.9925 23 16.7286L23 13C23 12.8145 23.0505 12.6408 23.1384 12.492L21.3232 10.6768L21.6768 10.3232L23.492 12.1384ZM26.596 14.3347C26.9067 14.6453 26.9067 15.149 26.596 15.4596C26.2854 15.7703 25.7817 15.7703 25.4711 15.4596C25.1605 15.149 25.1605 14.6453 25.4711 14.3347C25.7817 14.0241 26.2854 14.0241 26.596 14.3347Z" fill="#348899"/>
+<rect x="1" y="9" width="20" height="12" stroke="none" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" stroke="none" d="M0 9C0 8.44772 0.447715 8 1 8H21C21.5523 8 22 8.44772 22 9V23C22 23.5523 21.5523 24 21 24H14V25.6L16.3685 26.3106C16.7433 26.423 17 26.768 17 27.1593C17 27.6487 16.6033 28.0454 16.1139 28.0454H5.88612C5.39673 28.0454 5 27.6487 5 27.1593C5 26.768 5.25668 26.423 5.63149 26.3106L8 25.6V24H1C0.447716 24 0 23.5523 0 23V9ZM1 9H21V21H1V9Z" fill="#333333"/>
+</symbol>
</svg>
diff --git a/src/assets/form/venteMaterielPrixSolidaire.svg b/src/assets/form/venteMaterielPrixSolidaire.svg
new file mode 100644
index 000000000..0eb47d1ad
--- /dev/null
+++ b/src/assets/form/venteMaterielPrixSolidaire.svg
@@ -0,0 +1,5 @@
+<svg height="35" width="35" viewBox="0 0 35 35" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" stroke="none" clip-rule="evenodd" d="M23.492 12.1384C23.6409 12.0504 23.8145 12 24 12L27.7415 12C28.005 12 28.2578 12.104 28.4451 12.2894L34.1522 17.9404C34.546 18.3303 34.5476 18.9662 34.1557 19.3581L30.3697 23.1441C29.978 23.5357 29.3427 23.5345 28.9526 23.1412L23.29 17.4329C23.1042 17.2456 23 16.9925 23 16.7286L23 13C23 12.8145 23.0505 12.6408 23.1384 12.492L21.3232 10.6768L21.6768 10.3232L23.492 12.1384ZM26.596 14.3347C26.9067 14.6453 26.9067 15.149 26.596 15.4596C26.2854 15.7703 25.7817 15.7703 25.4711 15.4596C25.1605 15.149 25.1605 14.6453 25.4711 14.3347C25.7817 14.0241 26.2854 14.0241 26.596 14.3347Z" fill="#348899"/>
+<rect x="1" y="9" width="20" height="12" stroke="none" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" stroke="none" d="M0 9C0 8.44772 0.447715 8 1 8H21C21.5523 8 22 8.44772 22 9V23C22 23.5523 21.5523 24 21 24H14V25.6L16.3685 26.3106C16.7433 26.423 17 26.768 17 27.1593C17 27.6487 16.6033 28.0454 16.1139 28.0454H5.88612C5.39673 28.0454 5 27.6487 5 27.1593C5 26.768 5.25668 26.423 5.63149 26.3106L8 25.6V24H1C0.447716 24 0 23.5523 0 23V9ZM1 9H21V21H1V9Z" fill="#333333"/>
+</svg>
diff --git a/src/assets/ico/sprite.svg b/src/assets/ico/sprite.svg
index 5fa4fc95c..aedc0249d 100644
--- a/src/assets/ico/sprite.svg
+++ b/src/assets/ico/sprite.svg
@@ -300,5 +300,4 @@
<line x1="10.0176" y1="24.9287" x2="16.0176" y2="24.9287" stroke="#348899" stroke-width="2" stroke-linecap="round"/>
</symbol>
-
</svg>
--
GitLab