From 90f9f7b81b68ad856797d3d5498168db72311bbd Mon Sep 17 00:00:00 2001 From: xdrm-brackets Date: Thu, 14 Jul 2016 10:52:04 +0200 Subject: [PATCH] =?UTF-8?q?module=20'clusterDefault/memberChoice'=20renvoi?= =?UTF-8?q?e=20la=20vue=20de=20choix=20associ=C3=A9e=20au=20groupe=20s?= =?UTF-8?q?=C3=A9lectionn=20=C3=A9=20+=20nouveau=20loader?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/modules.json | 11 +++++ css/header.scss | 2 +- css/header/expanded.css | 4 +- css/header/min.css | 4 +- manager/View.php | 7 ++++ manager/module/clusterDefault.php | 24 +++++++++++ src/static/loaderv2.svg | 42 +++++++++++++++++++ view/groups.php | 16 +++---- view/js/groups-min.js | 11 ++--- view/js/groups.js | 69 ++++++++++++++++++++++--------- 10 files changed, 152 insertions(+), 38 deletions(-) create mode 100644 src/static/loaderv2.svg diff --git a/config/modules.json b/config/modules.json index d7cc72c..508ea69 100755 --- a/config/modules.json +++ b/config/modules.json @@ -433,6 +433,17 @@ "output": { "status": { "description": "Status de la suppression.", "type": "boolean" } } + }, + + "memberChoice": { + "description": "Vue de modification des membres d'un groupe", + "permissions": ["warehouse", "admin"], + "parameters": { + "id_cluster": { "description": "UID du groupe.", "type": "id" } + }, + "ouptut": { + "view": { "description": "Vue HTML du choix des membres.", "type": "text" } + } } } diff --git a/css/header.scss b/css/header.scss index a32b9f2..bc2159b 100755 --- a/css/header.scss +++ b/css/header.scss @@ -25,7 +25,7 @@ /* Animation de chargement qudnd chargement ajax */ &.loading > .icon{ - background-image: url('/src/static/loader.svg'); + background-image: url('/src/static/loaderv2.svg'); background-size: 70% 70%; } diff --git a/css/header/expanded.css b/css/header/expanded.css index ef1ee3c..fa0216f 100644 --- a/css/header/expanded.css +++ b/css/header/expanded.css @@ -24,8 +24,8 @@ } #WRAPPER > #HEADER.loading > .icon { - background-image: url("/src/static/loader.svg"); + background-image: url("/src/static/loaderv2.svg"); background-size: 70% 70%; } -/*# sourceMappingURL=data:application/json;base64,ewoJInZlcnNpb24iOiAzLAoJImZpbGUiOiAiZXhwYW5kZWQuY3NzIiwKCSJzb3VyY2VzIjogWwoJCSIuLi9oZWFkZXIuc2NzcyIsCgkJIi4uL2NvbnN0YW50cy5zY3NzIgoJXSwKCSJzb3VyY2VzQ29udGVudCI6IFsKCQkiQGltcG9ydCAnY29uc3RhbnRzJztcblxuXG4jV1JBUFBFUiA+ICNIRUFERVJ7XG5cdC8vIEljb25lIGR1IHNpdGVcblx0JiA+IC5pY29ue1xuXHRcdGRpc3BsYXk6IGJsb2NrO1xuXHRcdHBvc2l0aW9uOiBhYnNvbHV0ZTtcblx0XHRcdHRvcDogMDtcblx0XHRcdGxlZnQ6IDA7XG5cdFx0XHR3aWR0aDogJG1lbnUtc2lkZS13aWR0aDtcblx0XHRcdGhlaWdodDogJG1lbnUtc2lkZS13aWR0aDtcblxuXHRcdGJhY2tncm91bmQtY29sb3I6IGRhcmtlbigkdGhlbWUtY29sb3IsIDEwKTtcblx0XHRiYWNrZ3JvdW5kLWltYWdlOiB1cmwoJy9zcmMvc3RhdGljL2ljb252Mi5zdmcnKTtcblx0XHRiYWNrZ3JvdW5kLXBvc2l0aW9uOiBjZW50ZXIgY2VudGVyO1xuXHRcdGJhY2tncm91bmQtcmVwZWF0OiBuby1yZXBlYXQ7XG5cdFx0YmFja2dyb3VuZC1zaXplOiA1MCUgNTAlO1xuXG5cdFx0Y3Vyc29yOiBwb2ludGVyO1xuXG5cdFx0dHJhbnNpdGlvbjogYWxsIC4zcztcblxuXHR9XG5cblx0LyogQW5pbWF0aW9uIGRlIGNoYXJnZW1lbnQgcXVkbmQgY2hhcmdlbWVudCBhamF4ICovXG5cdCYubG9hZGluZyA+IC5pY29ue1xuXHRcdGJhY2tncm91bmQtaW1hZ2U6IHVybCgnL3NyYy9zdGF0aWMvbG9hZGVyLnN2ZycpO1xuXHRcdGJhY2tncm91bmQtc2l6ZTogNzAlIDcwJTtcblx0fVxuXG59XG4iLAoJCSIvKiBDT1VMRVVSIERVIFRIRU1FICovXG4kdGhlbWUtY29sb3I6ICNmNDRmMDY7XG5cbi8qIENPVUxFVVIgRFUgU09VUy1NRU5VICovXG4kc3ViLW1lbnUtY29sb3I6ICM1YjVlNjM7XG5cbi8qIENPVUxFVVIgREVTIEVSUkVVUlMgKi9cbiRlcnJvci1jb2xvcjogI2NjNTg1NztcblxuLyogRk9STVVMQUlSRVMgKi9cbiRmb3JtLXZhbGlkLWNvbG9yOiAgICMyN2E1NjA7XG4kZm9ybS1uZXV0cmFsLWNvbG9yOiAjMjE5M2U2O1xuJGZvcm0tc2VhcmNoLWNvbG9yOiAgIzU2MzBlZDtcbiRmb3JtLWludmFsaWQtY29sb3I6ICNkNTI5MTg7XG5cblxuLyogR0VTVElPTiBERVMgTE9OR1VFVVJTICovXG4kbWVudS1zaWRlLXdpZHRoOiA0ZW07XG5cblxuLy8gUE9VUiBSRVNPVVJDRV9ESVNQQVRDSEVSXG4kcmQtZm9ybS12YWxpZC1jb2xvcjogICAnMjdhNTYwJztcbiRyZC1mb3JtLW5ldXRyYWwtY29sb3I6ICcyMTkzZTYnO1xuJHJkLWZvcm0tc2VhcmNoLWNvbG9yOiAgJzU2MzBlZCc7XG4kcmQtZm9ybS1pbnZhbGlkLWNvbG9yOiAnZDUyOTE4JztcbiIKCV0sCgkibWFwcGluZ3MiOiAiQUNBQSxzQkFBc0I7QUFHdEIsMEJBQTBCO0FBRzFCLHlCQUF5QjtBQUd6QixpQkFBaUI7QUFPakIsMkJBQTJCO0FEYjNCLEFBQVcsUUFBSCxHQUFHLE9BQU8sQ0FBQTtFQXNCakIsbURBQW1EO0NBTW5EOztBQTVCRCxBQUVLLFFBRkcsR0FBRyxPQUFPLEdBRWIsS0FBSyxDQUFBO0VBQ1IsT0FBTyxFQUFFLEtBQU07RUFDZixRQUFRLEVBQUUsUUFBUztFQUNsQixHQUFHLEVBQUUsQ0FBRTtFQUNQLElBQUksRUFBRSxDQUFFO0VBQ1IsS0FBSyxFQ09VLEdBQUc7RURObEIsTUFBTSxFQ01TLEdBQUc7RURKbkIsZ0JBQWdCLEVBQUUsT0FBTTtFQUN4QixnQkFBZ0IsRUFBRSw2QkFBRztFQUNyQixtQkFBbUIsRUFBRSxhQUFjO0VBQ25DLGlCQUFpQixFQUFFLFNBQVU7RUFDN0IsZUFBZSxFQUFFLE9BQVE7RUFFekIsTUFBTSxFQUFFLE9BQVE7RUFFaEIsVUFBVSxFQUFFLE9BQVE7Q0FFcEI7O0FBcEJGLEFBdUJhLFFBdkJMLEdBQUcsT0FBTyxBQXVCaEIsUUFBUSxHQUFHLEtBQUssQ0FBQTtFQUNoQixnQkFBZ0IsRUFBRSw2QkFBRztFQUNyQixlQUFlLEVBQUUsT0FBUTtDQUN6QiIsCgkibmFtZXMiOiBbXQp9 */ \ No newline at end of file +/*# sourceMappingURL=data:application/json;base64,ewoJInZlcnNpb24iOiAzLAoJImZpbGUiOiAiZXhwYW5kZWQuY3NzIiwKCSJzb3VyY2VzIjogWwoJCSIuLi9oZWFkZXIuc2NzcyIsCgkJIi4uL2NvbnN0YW50cy5zY3NzIgoJXSwKCSJzb3VyY2VzQ29udGVudCI6IFsKCQkiQGltcG9ydCAnY29uc3RhbnRzJztcblxuXG4jV1JBUFBFUiA+ICNIRUFERVJ7XG5cdC8vIEljb25lIGR1IHNpdGVcblx0JiA+IC5pY29ue1xuXHRcdGRpc3BsYXk6IGJsb2NrO1xuXHRcdHBvc2l0aW9uOiBhYnNvbHV0ZTtcblx0XHRcdHRvcDogMDtcblx0XHRcdGxlZnQ6IDA7XG5cdFx0XHR3aWR0aDogJG1lbnUtc2lkZS13aWR0aDtcblx0XHRcdGhlaWdodDogJG1lbnUtc2lkZS13aWR0aDtcblxuXHRcdGJhY2tncm91bmQtY29sb3I6IGRhcmtlbigkdGhlbWUtY29sb3IsIDEwKTtcblx0XHRiYWNrZ3JvdW5kLWltYWdlOiB1cmwoJy9zcmMvc3RhdGljL2ljb252Mi5zdmcnKTtcblx0XHRiYWNrZ3JvdW5kLXBvc2l0aW9uOiBjZW50ZXIgY2VudGVyO1xuXHRcdGJhY2tncm91bmQtcmVwZWF0OiBuby1yZXBlYXQ7XG5cdFx0YmFja2dyb3VuZC1zaXplOiA1MCUgNTAlO1xuXG5cdFx0Y3Vyc29yOiBwb2ludGVyO1xuXG5cdFx0dHJhbnNpdGlvbjogYWxsIC4zcztcblxuXHR9XG5cblx0LyogQW5pbWF0aW9uIGRlIGNoYXJnZW1lbnQgcXVkbmQgY2hhcmdlbWVudCBhamF4ICovXG5cdCYubG9hZGluZyA+IC5pY29ue1xuXHRcdGJhY2tncm91bmQtaW1hZ2U6IHVybCgnL3NyYy9zdGF0aWMvbG9hZGVydjIuc3ZnJyk7XG5cdFx0YmFja2dyb3VuZC1zaXplOiA3MCUgNzAlO1xuXHR9XG5cbn1cbiIsCgkJIi8qIENPVUxFVVIgRFUgVEhFTUUgKi9cbiR0aGVtZS1jb2xvcjogI2Y0NGYwNjtcblxuLyogQ09VTEVVUiBEVSBTT1VTLU1FTlUgKi9cbiRzdWItbWVudS1jb2xvcjogIzViNWU2MztcblxuLyogQ09VTEVVUiBERVMgRVJSRVVSUyAqL1xuJGVycm9yLWNvbG9yOiAjY2M1ODU3O1xuXG4vKiBGT1JNVUxBSVJFUyAqL1xuJGZvcm0tdmFsaWQtY29sb3I6ICAgIzI3YTU2MDtcbiRmb3JtLW5ldXRyYWwtY29sb3I6ICMyMTkzZTY7XG4kZm9ybS1zZWFyY2gtY29sb3I6ICAjNTYzMGVkO1xuJGZvcm0taW52YWxpZC1jb2xvcjogI2Q1MjkxODtcblxuXG4vKiBHRVNUSU9OIERFUyBMT05HVUVVUlMgKi9cbiRtZW51LXNpZGUtd2lkdGg6IDRlbTtcblxuXG4vLyBQT1VSIFJFU09VUkNFX0RJU1BBVENIRVJcbiRyZC1mb3JtLXZhbGlkLWNvbG9yOiAgICcyN2E1NjAnO1xuJHJkLWZvcm0tbmV1dHJhbC1jb2xvcjogJzIxOTNlNic7XG4kcmQtZm9ybS1zZWFyY2gtY29sb3I6ICAnNTYzMGVkJztcbiRyZC1mb3JtLWludmFsaWQtY29sb3I6ICdkNTI5MTgnO1xuIgoJXSwKCSJtYXBwaW5ncyI6ICJBQ0FBLHNCQUFzQjtBQUd0QiwwQkFBMEI7QUFHMUIseUJBQXlCO0FBR3pCLGlCQUFpQjtBQU9qQiwyQkFBMkI7QURiM0IsQUFBVyxRQUFILEdBQUcsT0FBTyxDQUFBO0VBc0JqQixtREFBbUQ7Q0FNbkQ7O0FBNUJELEFBRUssUUFGRyxHQUFHLE9BQU8sR0FFYixLQUFLLENBQUE7RUFDUixPQUFPLEVBQUUsS0FBTTtFQUNmLFFBQVEsRUFBRSxRQUFTO0VBQ2xCLEdBQUcsRUFBRSxDQUFFO0VBQ1AsSUFBSSxFQUFFLENBQUU7RUFDUixLQUFLLEVDT1UsR0FBRztFRE5sQixNQUFNLEVDTVMsR0FBRztFREpuQixnQkFBZ0IsRUFBRSxPQUFNO0VBQ3hCLGdCQUFnQixFQUFFLDZCQUFHO0VBQ3JCLG1CQUFtQixFQUFFLGFBQWM7RUFDbkMsaUJBQWlCLEVBQUUsU0FBVTtFQUM3QixlQUFlLEVBQUUsT0FBUTtFQUV6QixNQUFNLEVBQUUsT0FBUTtFQUVoQixVQUFVLEVBQUUsT0FBUTtDQUVwQjs7QUFwQkYsQUF1QmEsUUF2QkwsR0FBRyxPQUFPLEFBdUJoQixRQUFRLEdBQUcsS0FBSyxDQUFBO0VBQ2hCLGdCQUFnQixFQUFFLCtCQUFHO0VBQ3JCLGVBQWUsRUFBRSxPQUFRO0NBQ3pCIiwKCSJuYW1lcyI6IFtdCn0= */ \ No newline at end of file diff --git a/css/header/min.css b/css/header/min.css index d290e8c..b03406c 100644 --- a/css/header/min.css +++ b/css/header/min.css @@ -1,3 +1,3 @@ -#WRAPPER>#HEADER>.icon{display:block;position:absolute;top:0;left:0;width:4em;height:4em;background-color:#c23f05;background-image:url("/src/static/iconv2.svg");background-position:center center;background-repeat:no-repeat;background-size:50% 50%;cursor:pointer;transition:all .3s}#WRAPPER>#HEADER.loading>.icon{background-image:url("/src/static/loader.svg");background-size:70% 70%} +#WRAPPER>#HEADER>.icon{display:block;position:absolute;top:0;left:0;width:4em;height:4em;background-color:#c23f05;background-image:url("/src/static/iconv2.svg");background-position:center center;background-repeat:no-repeat;background-size:50% 50%;cursor:pointer;transition:all .3s}#WRAPPER>#HEADER.loading>.icon{background-image:url("/src/static/loaderv2.svg");background-size:70% 70%} -/*# sourceMappingURL=data:application/json;base64,ewoJInZlcnNpb24iOiAzLAoJImZpbGUiOiAibWluLmNzcyIsCgkic291cmNlcyI6IFsKCQkiLi4vaGVhZGVyLnNjc3MiLAoJCSIuLi9jb25zdGFudHMuc2NzcyIKCV0sCgkic291cmNlc0NvbnRlbnQiOiBbCgkJIkBpbXBvcnQgJ2NvbnN0YW50cyc7XG5cblxuI1dSQVBQRVIgPiAjSEVBREVSe1xuXHQvLyBJY29uZSBkdSBzaXRlXG5cdCYgPiAuaWNvbntcblx0XHRkaXNwbGF5OiBibG9jaztcblx0XHRwb3NpdGlvbjogYWJzb2x1dGU7XG5cdFx0XHR0b3A6IDA7XG5cdFx0XHRsZWZ0OiAwO1xuXHRcdFx0d2lkdGg6ICRtZW51LXNpZGUtd2lkdGg7XG5cdFx0XHRoZWlnaHQ6ICRtZW51LXNpZGUtd2lkdGg7XG5cblx0XHRiYWNrZ3JvdW5kLWNvbG9yOiBkYXJrZW4oJHRoZW1lLWNvbG9yLCAxMCk7XG5cdFx0YmFja2dyb3VuZC1pbWFnZTogdXJsKCcvc3JjL3N0YXRpYy9pY29udjIuc3ZnJyk7XG5cdFx0YmFja2dyb3VuZC1wb3NpdGlvbjogY2VudGVyIGNlbnRlcjtcblx0XHRiYWNrZ3JvdW5kLXJlcGVhdDogbm8tcmVwZWF0O1xuXHRcdGJhY2tncm91bmQtc2l6ZTogNTAlIDUwJTtcblxuXHRcdGN1cnNvcjogcG9pbnRlcjtcblxuXHRcdHRyYW5zaXRpb246IGFsbCAuM3M7XG5cblx0fVxuXG5cdC8qIEFuaW1hdGlvbiBkZSBjaGFyZ2VtZW50IHF1ZG5kIGNoYXJnZW1lbnQgYWpheCAqL1xuXHQmLmxvYWRpbmcgPiAuaWNvbntcblx0XHRiYWNrZ3JvdW5kLWltYWdlOiB1cmwoJy9zcmMvc3RhdGljL2xvYWRlci5zdmcnKTtcblx0XHRiYWNrZ3JvdW5kLXNpemU6IDcwJSA3MCU7XG5cdH1cblxufVxuIiwKCQkiLyogQ09VTEVVUiBEVSBUSEVNRSAqL1xuJHRoZW1lLWNvbG9yOiAjZjQ0ZjA2O1xuXG4vKiBDT1VMRVVSIERVIFNPVVMtTUVOVSAqL1xuJHN1Yi1tZW51LWNvbG9yOiAjNWI1ZTYzO1xuXG4vKiBDT1VMRVVSIERFUyBFUlJFVVJTICovXG4kZXJyb3ItY29sb3I6ICNjYzU4NTc7XG5cbi8qIEZPUk1VTEFJUkVTICovXG4kZm9ybS12YWxpZC1jb2xvcjogICAjMjdhNTYwO1xuJGZvcm0tbmV1dHJhbC1jb2xvcjogIzIxOTNlNjtcbiRmb3JtLXNlYXJjaC1jb2xvcjogICM1NjMwZWQ7XG4kZm9ybS1pbnZhbGlkLWNvbG9yOiAjZDUyOTE4O1xuXG5cbi8qIEdFU1RJT04gREVTIExPTkdVRVVSUyAqL1xuJG1lbnUtc2lkZS13aWR0aDogNGVtO1xuXG5cbi8vIFBPVVIgUkVTT1VSQ0VfRElTUEFUQ0hFUlxuJHJkLWZvcm0tdmFsaWQtY29sb3I6ICAgJzI3YTU2MCc7XG4kcmQtZm9ybS1uZXV0cmFsLWNvbG9yOiAnMjE5M2U2JztcbiRyZC1mb3JtLXNlYXJjaC1jb2xvcjogICc1NjMwZWQnO1xuJHJkLWZvcm0taW52YWxpZC1jb2xvcjogJ2Q1MjkxOCc7XG4iCgldLAoJIm1hcHBpbmdzIjogIkFBR0EsQUFFSyxRQUZHLENBQUcsT0FBTyxDQUViLEtBQUssQUFBQSxDQUNSLE9BQU8sQ0FBRSxLQUFNLENBQ2YsUUFBUSxDQUFFLFFBQVMsQ0FDbEIsR0FBRyxDQUFFLENBQUUsQ0FDUCxJQUFJLENBQUUsQ0FBRSxDQUNSLEtBQUssQ0NPVSxHQUFHLENETmxCLE1BQU0sQ0NNUyxHQUFHLENESm5CLGdCQUFnQixDQUFFLE9BQU0sQ0FDeEIsZ0JBQWdCLENBQUUsNkJBQUcsQ0FDckIsbUJBQW1CLENBQUUsYUFBYyxDQUNuQyxpQkFBaUIsQ0FBRSxTQUFVLENBQzdCLGVBQWUsQ0FBRSxPQUFRLENBRXpCLE1BQU0sQ0FBRSxPQUFRLENBRWhCLFVBQVUsQ0FBRSxPQUFRLENBRXBCLEFBcEJGLEFBdUJhLFFBdkJMLENBQUcsT0FBTyxBQXVCaEIsUUFBUSxDQUFHLEtBQUssQUFBQSxDQUNoQixnQkFBZ0IsQ0FBRSw2QkFBRyxDQUNyQixlQUFlLENBQUUsT0FBUSxDQUN6QiIsCgkibmFtZXMiOiBbXQp9 */ \ No newline at end of file +/*# sourceMappingURL=data:application/json;base64,ewoJInZlcnNpb24iOiAzLAoJImZpbGUiOiAibWluLmNzcyIsCgkic291cmNlcyI6IFsKCQkiLi4vaGVhZGVyLnNjc3MiLAoJCSIuLi9jb25zdGFudHMuc2NzcyIKCV0sCgkic291cmNlc0NvbnRlbnQiOiBbCgkJIkBpbXBvcnQgJ2NvbnN0YW50cyc7XG5cblxuI1dSQVBQRVIgPiAjSEVBREVSe1xuXHQvLyBJY29uZSBkdSBzaXRlXG5cdCYgPiAuaWNvbntcblx0XHRkaXNwbGF5OiBibG9jaztcblx0XHRwb3NpdGlvbjogYWJzb2x1dGU7XG5cdFx0XHR0b3A6IDA7XG5cdFx0XHRsZWZ0OiAwO1xuXHRcdFx0d2lkdGg6ICRtZW51LXNpZGUtd2lkdGg7XG5cdFx0XHRoZWlnaHQ6ICRtZW51LXNpZGUtd2lkdGg7XG5cblx0XHRiYWNrZ3JvdW5kLWNvbG9yOiBkYXJrZW4oJHRoZW1lLWNvbG9yLCAxMCk7XG5cdFx0YmFja2dyb3VuZC1pbWFnZTogdXJsKCcvc3JjL3N0YXRpYy9pY29udjIuc3ZnJyk7XG5cdFx0YmFja2dyb3VuZC1wb3NpdGlvbjogY2VudGVyIGNlbnRlcjtcblx0XHRiYWNrZ3JvdW5kLXJlcGVhdDogbm8tcmVwZWF0O1xuXHRcdGJhY2tncm91bmQtc2l6ZTogNTAlIDUwJTtcblxuXHRcdGN1cnNvcjogcG9pbnRlcjtcblxuXHRcdHRyYW5zaXRpb246IGFsbCAuM3M7XG5cblx0fVxuXG5cdC8qIEFuaW1hdGlvbiBkZSBjaGFyZ2VtZW50IHF1ZG5kIGNoYXJnZW1lbnQgYWpheCAqL1xuXHQmLmxvYWRpbmcgPiAuaWNvbntcblx0XHRiYWNrZ3JvdW5kLWltYWdlOiB1cmwoJy9zcmMvc3RhdGljL2xvYWRlcnYyLnN2ZycpO1xuXHRcdGJhY2tncm91bmQtc2l6ZTogNzAlIDcwJTtcblx0fVxuXG59XG4iLAoJCSIvKiBDT1VMRVVSIERVIFRIRU1FICovXG4kdGhlbWUtY29sb3I6ICNmNDRmMDY7XG5cbi8qIENPVUxFVVIgRFUgU09VUy1NRU5VICovXG4kc3ViLW1lbnUtY29sb3I6ICM1YjVlNjM7XG5cbi8qIENPVUxFVVIgREVTIEVSUkVVUlMgKi9cbiRlcnJvci1jb2xvcjogI2NjNTg1NztcblxuLyogRk9STVVMQUlSRVMgKi9cbiRmb3JtLXZhbGlkLWNvbG9yOiAgICMyN2E1NjA7XG4kZm9ybS1uZXV0cmFsLWNvbG9yOiAjMjE5M2U2O1xuJGZvcm0tc2VhcmNoLWNvbG9yOiAgIzU2MzBlZDtcbiRmb3JtLWludmFsaWQtY29sb3I6ICNkNTI5MTg7XG5cblxuLyogR0VTVElPTiBERVMgTE9OR1VFVVJTICovXG4kbWVudS1zaWRlLXdpZHRoOiA0ZW07XG5cblxuLy8gUE9VUiBSRVNPVVJDRV9ESVNQQVRDSEVSXG4kcmQtZm9ybS12YWxpZC1jb2xvcjogICAnMjdhNTYwJztcbiRyZC1mb3JtLW5ldXRyYWwtY29sb3I6ICcyMTkzZTYnO1xuJHJkLWZvcm0tc2VhcmNoLWNvbG9yOiAgJzU2MzBlZCc7XG4kcmQtZm9ybS1pbnZhbGlkLWNvbG9yOiAnZDUyOTE4JztcbiIKCV0sCgkibWFwcGluZ3MiOiAiQUFHQSxBQUVLLFFBRkcsQ0FBRyxPQUFPLENBRWIsS0FBSyxBQUFBLENBQ1IsT0FBTyxDQUFFLEtBQU0sQ0FDZixRQUFRLENBQUUsUUFBUyxDQUNsQixHQUFHLENBQUUsQ0FBRSxDQUNQLElBQUksQ0FBRSxDQUFFLENBQ1IsS0FBSyxDQ09VLEdBQUcsQ0RObEIsTUFBTSxDQ01TLEdBQUcsQ0RKbkIsZ0JBQWdCLENBQUUsT0FBTSxDQUN4QixnQkFBZ0IsQ0FBRSw2QkFBRyxDQUNyQixtQkFBbUIsQ0FBRSxhQUFjLENBQ25DLGlCQUFpQixDQUFFLFNBQVUsQ0FDN0IsZUFBZSxDQUFFLE9BQVEsQ0FFekIsTUFBTSxDQUFFLE9BQVEsQ0FFaEIsVUFBVSxDQUFFLE9BQVEsQ0FFcEIsQUFwQkYsQUF1QmEsUUF2QkwsQ0FBRyxPQUFPLEFBdUJoQixRQUFRLENBQUcsS0FBSyxBQUFBLENBQ2hCLGdCQUFnQixDQUFFLCtCQUFHLENBQ3JCLGVBQWUsQ0FBRSxPQUFRLENBQ3pCIiwKCSJuYW1lcyI6IFtdCn0= */ \ No newline at end of file diff --git a/manager/View.php b/manager/View.php index a37ac00..822999c 100644 --- a/manager/View.php +++ b/manager/View.php @@ -73,6 +73,13 @@ echo $this->view; } + /* RETOURNE LA VUE CALCULEE + * + */ + public function getView(){ + return $this->view; + } + diff --git a/manager/module/clusterDefault.php b/manager/module/clusterDefault.php index 8bf089e..fcf28de 100644 --- a/manager/module/clusterDefault.php +++ b/manager/module/clusterDefault.php @@ -1,6 +1,7 @@ UID du groupe en question + * + * @return view Retourne la vue HTML du choix des membres du groupe + * + */ + public static function memberChoice($params){ + extract($params); + + $view = new View('group.membersChoice',[ + 'id_cluster' => $id_cluster + ]); + + return [ + 'view' => $view->getView() + ]; + } + + } diff --git a/src/static/loaderv2.svg b/src/static/loaderv2.svg new file mode 100644 index 0000000..ad9cb74 --- /dev/null +++ b/src/static/loaderv2.svg @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/view/groups.php b/view/groups.php index b7f81d0..5abfc39 100755 --- a/view/groups.php +++ b/view/groups.php @@ -167,13 +167,13 @@ /* [4] Gestion de filtrage =========================================================*/ echo "
"; - - debug(); - - $userForGroup = new View('group.membersChoice', [ - 'id_cluster' => 202 // groupe "b" de type MACHINE - ]); - - $userForGroup->view(); + // + // debug(); + // + // $userForGroup = new View('group.membersChoice', [ + // 'id_cluster' => 202 // groupe "b" de type MACHINE + // ]); + // + // $userForGroup->view(); echo '
'; diff --git a/view/js/groups-min.js b/view/js/groups-min.js index 559c2a8..1fa7c6d 100644 --- a/view/js/groups-min.js +++ b/view/js/groups-min.js @@ -1,11 +1,11 @@ var section={view:{text:'#CONTAINER > section[data-sublink="view"] ',element:document.querySelector('#CONTAINER > section[data-sublink="view"]'),searchbar:document.querySelector('#CONTAINER > section[data-sublink="view"] > .searchbar')},create:{text:'#CONTAINER > section[data-sublink="create"] ',element:document.querySelector('#CONTAINER > section[data-sublink="create"]')},remove:{text:'#CONTAINER > section[data-sublink="remove"] ',element:document.querySelector('#CONTAINER > section[data-sublink="remove"]')}, -edit:{text:'#CONTAINER > section[data-sublink="edit"] ',element:document.querySelector('#CONTAINER > section[data-sublink="edit"]')}}; -if(null!=section.view.element){1 section[data-sublink="edit"] ',element:document.querySelector('#CONTAINER > section[data-sublink="edit"]')},filter:{text:'#CONTAINER > section[data-sublink="filter"] ',element:document.querySelector('#CONTAINER > section[data-sublink="filter"]')}}; +if(null!=section.view.element){1 article.inline-box[id]");for(c=0;c section[data-sublink="edit"] ', element: document.querySelector('#CONTAINER > section[data-sublink="edit"]') + }, + + filter: { + text: '#CONTAINER > section[data-sublink="filter"] ', + element: document.querySelector('#CONTAINER > section[data-sublink="filter"]') } }; @@ -43,7 +48,7 @@ if( section.view.element != null ){ /* (2) On récupère toutes les actions de groupes */ section.view.group = { - rem: document.querySelectorAll(section.view.text + '.rem-group[data-cluster][data-group]'), + rem: document.querySelectorAll(section.view.text + '.rem-group[data-cluster][data-member]'), add: document.querySelectorAll(section.view.text + '.add-group[data-cluster]') }; @@ -136,24 +141,10 @@ if( section.view.element != null ){ for( var i = 0 ; i < section.view.group.add.length ; i++ ){ section.view.group.add[i].addEventListener('click', function(e){ - // {1} On rédige la requête // - var request = { - path: 'clusterDefault/unlink', - id_user: e.target.getData('user'), - id_cluster: e.target.getData('group') - }; - // {2} On envoie la requête // - api.send(request, function(response){ - - // {3} Si erreur, on ne fait rien // - if( response.ModuleError != 0 ) - return false; - - - // {4} Si tout s'est bien passé // - e.target.parentNode.parentNode.removeChild( e.target.parentNode ); - }); + pageManager.vars[1] = e.target.getData('cluster'); + navSubMenu('filter'); + document.location = ''; }, false); @@ -204,8 +195,8 @@ if( section.create.element != null ){ console.log('Groupe cree!'); // On redirige sur la cluster - pageManager.vars = ['view', answer.id_cluster]; - pageManager.refresh(); + pageManager.vars[1] = answer.id_cluster; + navSubMenu('view'); document.location = ''; section.create.input.submit.anim('active', 1500); @@ -600,3 +591,41 @@ if( section.edit.element != null ){ } + + + + + + + + + + + + + + +/* GESTION DE LA MODIFICATION DES MEMBRES +* +*/ +if( section.filter.element != null ){ + + /* [1] Si id_cluster dans URL + =========================================================*/ + if( pageManager.vars.length > 1 && !isNaN(pageManager.vars[1]) ){ + + /* (1) On rédige la requête */ + var request = { + path: 'clusterDefault/memberChoice', // Modification des membres + id_cluster: pageManager.vars[1] + }; + + /* (2) On récupère la vue et on l'affiche */ + api.send(request, function(answer){ + if( answer.ModuleError == 0 ) + section.filter.element.innerHTML = answer.view; + }); + + } + +}