From f987715b41cbc39c5c28df471a1c946c82fd9c10 Mon Sep 17 00:00:00 2001
From: Alex Orluc <alex.orluc@maarch.org>
Date: Sat, 31 Mar 2018 02:34:29 +0200
Subject: [PATCH] improve display difflist
---
.../diffusionModel-administration.component.css | 15 +++++++++++++++
.../diffusionModel-administration.component.ts | 12 +++++++++---
2 files changed, 24 insertions(+), 3 deletions(-)
create mode 100755 apps/maarch_entreprise/css/diffusionModel-administration.component.css
diff --git a/apps/maarch_entreprise/css/diffusionModel-administration.component.css b/apps/maarch_entreprise/css/diffusionModel-administration.component.css
new file mode 100755
index 00000000000..bd3247a5c48
--- /dev/null
+++ b/apps/maarch_entreprise/css/diffusionModel-administration.component.css
@@ -0,0 +1,15 @@
+.mat-list-item[draggable="false"]:hover{
+ background: inherit;
+}
+
+.mat-list-item[draggable="false"]{
+ cursor: not-allowed !important;
+}
+
+.mat-list-item[draggable="true"]{
+ cursor: pointer;
+}
+
+.mat-list-item[draggable="true"] mat-icon{
+ cursor: move;
+}
\ No newline at end of file
diff --git a/apps/maarch_entreprise/js/angular/app/administration/diffusionModel-administration.component.ts b/apps/maarch_entreprise/js/angular/app/administration/diffusionModel-administration.component.ts
index 7081786ad9d..ca358974132 100644
--- a/apps/maarch_entreprise/js/angular/app/administration/diffusionModel-administration.component.ts
+++ b/apps/maarch_entreprise/js/angular/app/administration/diffusionModel-administration.component.ts
@@ -14,6 +14,7 @@ declare const angularGlobals: any;
@Component({
templateUrl: "../../../../Views/diffusionModel-administration.component.html",
+ styleUrls: ['../../../../css/diffusionModel-administration.component.css'],
providers: [NotificationService]
})
export class DiffusionModelAdministrationComponent extends AutoCompletePlugin implements OnInit {
@@ -129,10 +130,14 @@ export class DiffusionModelAdministrationComponent extends AutoCompletePlugin im
if (this.diffusionModel.diffusionList.length > 0) {
this.diffusionModel.diffusionList.forEach((listModel: any, i: number) => {
listModel.sequence = i;
- if (i == (this.diffusionModel.diffusionList.length - 1)) {
- listModel.item_mode = "sign";
+ if (this.diffusionModel.object_type == 'AVIS_CIRCUIT') {
+ listModel.item_mode = "avis";
} else {
- listModel.item_mode = "visa";
+ if (i == (this.diffusionModel.diffusionList.length - 1)) {
+ listModel.item_mode = "sign";
+ } else {
+ listModel.item_mode = "visa";
+ }
}
});
}
@@ -146,6 +151,7 @@ export class DiffusionModelAdministrationComponent extends AutoCompletePlugin im
this.idCircuit = this.diffusionModel.diffusionList[0].id;
}
this.loading = false;
+ this.listDiffModified = false;
}, () => {
location.href = "index.php";
--
GitLab