diff --git a/apps/maarch_entreprise/Views/baskets-order-administration.component.html b/apps/maarch_entreprise/Views/baskets-order-administration.component.html
new file mode 100644
index 0000000000000000000000000000000000000000..896e4b0d4499055a13dbd87d6ba6efa9d04adeec
--- /dev/null
+++ b/apps/maarch_entreprise/Views/baskets-order-administration.component.html
@@ -0,0 +1,50 @@
+<div *ngIf="loading">
+ <i class="fa fa-spinner fa-spin fa-5x" style="margin-left: 50%;margin-top: 16%;font-size: 8em"></i>
+</div>
+<div *ngIf="!loading" class="container-fluid">
+ <h1 style="margin-top: 0"><i class="fa fa-inbox fa-2x"></i> {{lang.administration}}</h1>
+ <nav class="navbar navbar-default" style="font-size:17px !important;" id="toolBox">
+ <div class="container-fluid">
+ <div class="navbar-header">
+ <a class="navbar-brand" routerLink="/administration" style="cursor: pointer">
+ <i class="fa fa-arrow-circle-left" title="{{lang.back}}"></i>
+ </a>
+ </div>
+ </div>
+ </nav>
+ <div class="col-md-12" style="margin-top: 1%">
+ <table id="usersTable" class="display" style="width: 100%" cellspacing="0" border="0">
+ <thead>
+ <tr>
+ <th style="width:15%;" valign="bottom" align="left"><span>{{lang.id}}</span></th>
+ <th style="width:20%;" valign="bottom" align="left"><span>{{lang.basket}}</span></th>
+ <th style="width:20%;" valign="bottom" align="left"><span>{{lang.description}}</span></th>
+ <th style="width:20%;"><span> </span></th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr *ngFor="let basket of baskets; let i = index">
+ <td>{{basket.basket_id}}</td>
+ <td>{{basket.basket_name}}</td>
+ <td>{{basket.basket_desc}}</td>
+ <td style="text-align:right;">
+ <div class="btn-group" role="group" aria-label="...">
+ <button [disabled]="i == 0" (click)="updateOrder(basket['basket_id'], 'UP', 'ALL')" type="button" class="btn btn-default">
+ <a><i style="cursor:pointer" class="fa fa-angle-double-up"></i></a>
+ </button>
+ <button [disabled]="i == 0" (click)="updateOrder(basket['basket_id'], 'UP', 'ONE')" type="button" class="btn btn-default">
+ <a><i style="cursor:pointer" class="fa fa-angle-up"></i></a>
+ </button>
+ <button [disabled]="i >= (baskets.length - 1)" (click)="updateOrder(basket['basket_id'], 'DOWN', 'ONE')" type="button" class="btn btn-default">
+ <a><i style="cursor:pointer" class="fa fa-angle-down"></i></a>
+ </button>
+ <button [disabled]="i >= (baskets.length - 1)" (click)="updateOrder(basket['basket_id'], 'DOWN', 'ALL')" type="button" class="btn btn-default">
+ <a><i style="cursor:pointer" class="fa fa-angle-double-down"></i></a>
+ </button>
+ </div>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+</div>
diff --git a/apps/maarch_entreprise/js/angular/app/administration/administration-routing.module.js b/apps/maarch_entreprise/js/angular/app/administration/administration-routing.module.js
index 7e7062fb0f2f6bb2f913fc4bb1cb41da46831f12..1c3b31620b7d7f82691f2f3ed6ce1cbc885f4898 100755
--- a/apps/maarch_entreprise/js/angular/app/administration/administration-routing.module.js
+++ b/apps/maarch_entreprise/js/angular/app/administration/administration-routing.module.js
@@ -14,6 +14,7 @@ var user_administration_component_1 = require("./user-administration.component")
var groups_administration_component_1 = require("./groups-administration.component");
var group_administration_component_1 = require("./group-administration.component");
var baskets_administration_component_1 = require("./baskets-administration.component");
+var baskets_order_administration_component_1 = require("./baskets-order-administration.component");
var basket_administration_component_1 = require("./basket-administration.component");
var statuses_administration_component_1 = require("./statuses-administration.component");
var status_administration_component_1 = require("./status-administration.component");
@@ -43,6 +44,7 @@ var AdministrationRoutingModule = /** @class */ (function () {
{ path: 'administration/groups/new', component: group_administration_component_1.GroupAdministrationComponent },
{ path: 'administration/groups/:id', component: group_administration_component_1.GroupAdministrationComponent },
{ path: 'administration/baskets', component: baskets_administration_component_1.BasketsAdministrationComponent },
+ { path: 'administration/baskets-sorted', component: baskets_order_administration_component_1.BasketsOrderAdministrationComponent },
{ path: 'administration/baskets/new', component: basket_administration_component_1.BasketAdministrationComponent },
{ path: 'administration/baskets/:id', component: basket_administration_component_1.BasketAdministrationComponent },
{ path: 'administration/status', component: statuses_administration_component_1.StatusesAdministrationComponent },
diff --git a/apps/maarch_entreprise/js/angular/app/administration/administration-routing.module.ts b/apps/maarch_entreprise/js/angular/app/administration/administration-routing.module.ts
index 886d0c570b0f67e8e1afe1532e0e83f323beb138..ac85af1b1e61985c6f2442a2e0adaef0db0602ea 100755
--- a/apps/maarch_entreprise/js/angular/app/administration/administration-routing.module.ts
+++ b/apps/maarch_entreprise/js/angular/app/administration/administration-routing.module.ts
@@ -7,6 +7,7 @@ import { UserAdministrationComponent } from './user-administration.comp
import { GroupsAdministrationComponent } from './groups-administration.component';
import { GroupAdministrationComponent } from './group-administration.component';
import { BasketsAdministrationComponent } from './baskets-administration.component';
+import { BasketsOrderAdministrationComponent } from './baskets-order-administration.component';
import { BasketAdministrationComponent } from './basket-administration.component';
import { StatusesAdministrationComponent } from './statuses-administration.component';
import { StatusAdministrationComponent } from './status-administration.component';
@@ -34,6 +35,7 @@ import { HistoryBatchAdministrationComponent } from './historyBatch-administrat
{ path: 'administration/groups/new', component: GroupAdministrationComponent },
{ path: 'administration/groups/:id', component: GroupAdministrationComponent },
{ path: 'administration/baskets', component: BasketsAdministrationComponent },
+ { path: 'administration/baskets-sorted', component: BasketsOrderAdministrationComponent },
{ path: 'administration/baskets/new', component: BasketAdministrationComponent },
{ path: 'administration/baskets/:id', component: BasketAdministrationComponent },
{ path: 'administration/status', component: StatusesAdministrationComponent },
diff --git a/apps/maarch_entreprise/js/angular/app/administration/administration.module.js b/apps/maarch_entreprise/js/angular/app/administration/administration.module.js
index d4821c15559fa59323750913fa93a51792b067fd..d4118121c5f6103b7a82f3c69f8326c39f8c5278 100755
--- a/apps/maarch_entreprise/js/angular/app/administration/administration.module.js
+++ b/apps/maarch_entreprise/js/angular/app/administration/administration.module.js
@@ -19,6 +19,7 @@ var user_administration_component_1 = require("./user-administration.component")
var groups_administration_component_1 = require("./groups-administration.component");
var group_administration_component_1 = require("./group-administration.component");
var baskets_administration_component_1 = require("./baskets-administration.component");
+var baskets_order_administration_component_1 = require("./baskets-order-administration.component");
var basket_administration_component_1 = require("./basket-administration.component");
var statuses_administration_component_1 = require("./statuses-administration.component");
var status_administration_component_1 = require("./status-administration.component");
@@ -53,6 +54,7 @@ var AdministrationModule = /** @class */ (function () {
groups_administration_component_1.GroupsAdministrationComponent,
group_administration_component_1.GroupAdministrationComponent,
baskets_administration_component_1.BasketsAdministrationComponent,
+ baskets_order_administration_component_1.BasketsOrderAdministrationComponent,
basket_administration_component_1.BasketAdministrationComponent,
statuses_administration_component_1.StatusesAdministrationComponent,
status_administration_component_1.StatusAdministrationComponent,
diff --git a/apps/maarch_entreprise/js/angular/app/administration/administration.module.ts b/apps/maarch_entreprise/js/angular/app/administration/administration.module.ts
index b5013cd0ee8f7781110b9d4256e1032cc6fc3463..9f3f32bb69699a13baa1e2379fd3dbca36b17ad1 100755
--- a/apps/maarch_entreprise/js/angular/app/administration/administration.module.ts
+++ b/apps/maarch_entreprise/js/angular/app/administration/administration.module.ts
@@ -13,6 +13,7 @@ import { UserAdministrationComponent } from './user-administrat
import { GroupsAdministrationComponent } from './groups-administration.component';
import { GroupAdministrationComponent } from './group-administration.component';
import { BasketsAdministrationComponent } from './baskets-administration.component';
+import { BasketsOrderAdministrationComponent } from './baskets-order-administration.component';
import { BasketAdministrationComponent } from './basket-administration.component';
import { StatusesAdministrationComponent } from './statuses-administration.component';
import { StatusAdministrationComponent } from './status-administration.component';
@@ -45,6 +46,7 @@ import { NotificationAdministrationComponent } from './notification-adm
GroupsAdministrationComponent,
GroupAdministrationComponent,
BasketsAdministrationComponent,
+ BasketsOrderAdministrationComponent,
BasketAdministrationComponent,
StatusesAdministrationComponent,
StatusAdministrationComponent,
diff --git a/apps/maarch_entreprise/js/angular/app/administration/baskets-order-administration.component.js b/apps/maarch_entreprise/js/angular/app/administration/baskets-order-administration.component.js
new file mode 100644
index 0000000000000000000000000000000000000000..eb9899cd28fe49f1194a7c69b5d719081c79a10b
--- /dev/null
+++ b/apps/maarch_entreprise/js/angular/app/administration/baskets-order-administration.component.js
@@ -0,0 +1,62 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+ var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+ if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+ else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+ return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+ if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var core_1 = require("@angular/core");
+var http_1 = require("@angular/common/http");
+var translate_component_1 = require("../translate.component");
+var notification_service_1 = require("../notification.service");
+var BasketsOrderAdministrationComponent = /** @class */ (function () {
+ function BasketsOrderAdministrationComponent(http, notify) {
+ this.http = http;
+ this.notify = notify;
+ this.lang = translate_component_1.LANG;
+ this.baskets = [];
+ this.loading = false;
+ }
+ BasketsOrderAdministrationComponent.prototype.updateBreadcrumb = function (applicationName) {
+ if ($j('#ariane')[0]) {
+ $j('#ariane')[0].innerHTML = "<a href='index.php?reinit=true'>" + applicationName + "</a> > <a onclick='location.hash = \"/administration\"' style='cursor: pointer'>Administration</a> > Ordre des bannettes";
+ }
+ };
+ BasketsOrderAdministrationComponent.prototype.ngOnInit = function () {
+ var _this = this;
+ this.updateBreadcrumb(angularGlobals.applicationName);
+ this.coreUrl = angularGlobals.coreUrl;
+ this.loading = true;
+ this.http.get(this.coreUrl + "rest/sortedBaskets")
+ .subscribe(function (data) {
+ _this.baskets = data['baskets'];
+ _this.loading = false;
+ }, function () {
+ location.href = "index.php";
+ });
+ };
+ BasketsOrderAdministrationComponent.prototype.updateOrder = function (id, method, power) {
+ var _this = this;
+ this.http.put(this.coreUrl + "rest/sortedBaskets/" + id, { "method": method, "power": power })
+ .subscribe(function (data) {
+ _this.baskets = data['baskets'];
+ _this.notify.success(_this.lang.modificationSaved);
+ }, function (err) {
+ _this.notify.error(err.error.errors);
+ });
+ };
+ BasketsOrderAdministrationComponent = __decorate([
+ core_1.Component({
+ templateUrl: angularGlobals["baskets-order-administrationView"],
+ styleUrls: ['../../node_modules/bootstrap/dist/css/bootstrap.min.css'],
+ providers: [notification_service_1.NotificationService]
+ }),
+ __metadata("design:paramtypes", [http_1.HttpClient, notification_service_1.NotificationService])
+ ], BasketsOrderAdministrationComponent);
+ return BasketsOrderAdministrationComponent;
+}());
+exports.BasketsOrderAdministrationComponent = BasketsOrderAdministrationComponent;
diff --git a/apps/maarch_entreprise/js/angular/app/administration/baskets-order-administration.component.ts b/apps/maarch_entreprise/js/angular/app/administration/baskets-order-administration.component.ts
new file mode 100644
index 0000000000000000000000000000000000000000..b80196bc8843d3f109a75b47025b9abe10ac1de0
--- /dev/null
+++ b/apps/maarch_entreprise/js/angular/app/administration/baskets-order-administration.component.ts
@@ -0,0 +1,60 @@
+import { Component, OnInit } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+import { LANG } from '../translate.component';
+import { NotificationService } from '../notification.service';
+
+declare function $j(selector: any) : any;
+
+declare var angularGlobals : any;
+
+
+@Component({
+ templateUrl : angularGlobals["baskets-order-administrationView"],
+ styleUrls : ['../../node_modules/bootstrap/dist/css/bootstrap.min.css'],
+ providers : [NotificationService]
+})
+export class BasketsOrderAdministrationComponent implements OnInit {
+
+ coreUrl : string;
+ lang : any = LANG;
+
+ baskets : any[] = [];
+
+ loading : boolean = false;
+
+
+ constructor(public http: HttpClient, private notify: NotificationService) {
+ }
+
+ updateBreadcrumb(applicationName: string) {
+ if ($j('#ariane')[0]) {
+ $j('#ariane')[0].innerHTML = "<a href='index.php?reinit=true'>" + applicationName + "</a> > <a onclick='location.hash = \"/administration\"' style='cursor: pointer'>Administration</a> > Ordre des bannettes";
+ }
+ }
+
+ ngOnInit(): void {
+ this.updateBreadcrumb(angularGlobals.applicationName);
+ this.coreUrl = angularGlobals.coreUrl;
+
+ this.loading = true;
+
+ this.http.get(this.coreUrl + "rest/sortedBaskets")
+ .subscribe((data : any) => {
+ this.baskets = data['baskets'];
+
+ this.loading = false;
+ }, () => {
+ location.href = "index.php";
+ });
+ }
+
+ updateOrder(id: string, method: string, power: string) {
+ this.http.put(this.coreUrl + "rest/sortedBaskets/" + id, {"method" : method, "power" : power})
+ .subscribe((data : any) => {
+ this.baskets = data['baskets'];
+ this.notify.success(this.lang.modificationSaved);
+ }, (err) => {
+ this.notify.error(err.error.errors);
+ });
+ }
+}
diff --git a/apps/maarch_entreprise/js/angular/app/administration/user-administration.component.ts b/apps/maarch_entreprise/js/angular/app/administration/user-administration.component.ts
index 922e9adc0fbcbe04399bbf90ce2da654a55638e8..c9d5cdca250189269870fa5dfd237fd525ee36f0 100755
--- a/apps/maarch_entreprise/js/angular/app/administration/user-administration.component.ts
+++ b/apps/maarch_entreprise/js/angular/app/administration/user-administration.component.ts
@@ -189,7 +189,7 @@ export class UserAdministrationComponent implements OnInit {
this.selectedSignatureLabel = this.user.signatures[index].signature_label;
}
- resetPassword(user:any) {
+ resetPassword(user: any) {
let r = confirm(this.lang.confirmAction+' '+this.lang.resetPsw);
if (r) {
@@ -237,7 +237,7 @@ export class UserAdministrationComponent implements OnInit {
});
}
- addEntity(entiyId:any) {
+ addEntity(entiyId: any) {
var entity = {
"entityId" : entiyId,
diff --git a/apps/maarch_entreprise/js/angularFunctions.js b/apps/maarch_entreprise/js/angularFunctions.js
index a4da1274dc52df66ae81be1f6ccbf907946e0070..2fbe15aabb033e92d8ea07932c7c90466a98bd74 100755
--- a/apps/maarch_entreprise/js/angularFunctions.js
+++ b/apps/maarch_entreprise/js/angularFunctions.js
@@ -8,6 +8,7 @@ function triggerAngular(prodmode, locationToGo) {
'groups-administration',
'group-administration',
'baskets-administration',
+ 'baskets-order-administration',
'basket-administration',
'status-administration',
'statuses-administration',