diff --git a/apps/maarch_entreprise/Views/baskets-administration.component.html b/apps/maarch_entreprise/Views/baskets-administration.component.html
index 47a1fd54a4be83c2bf88676deef33fb3cca9f91b..c856f2a2f83263bfc68e59b63858b401a04d83eb 100644
--- a/apps/maarch_entreprise/Views/baskets-administration.component.html
+++ b/apps/maarch_entreprise/Views/baskets-administration.component.html
@@ -37,7 +37,7 @@
{{lang.add}}
</p>
</a>
- <a mat-list-item routerLink=".">
+ <a mat-list-item (click)="snav2.toggle()">
<mat-icon color="primary" mat-list-icon class="fa fa-list-ol"></mat-icon>
<p mat-line>
{{lang.basketsOrder}}
@@ -90,9 +90,16 @@
<mat-sidenav #snav2 [mode]="mobileQuery.matches ? 'over' : 'side'" [fixedInViewport]="mobileQuery.matches" fixedTopGap="56"
position='end' [opened]="mobileQuery.matches ? false : false">
- <mat-nav-list>
- <h3 mat-subheader>Actions</h3>
- </mat-nav-list>
+ <mat-list>
+ <span dnd-sortable-container [dropZones]="['boxers-zone']" [sortableData]="basketsOrder">
+ <mat-list-item disableRipple="true" *ngFor="let basket of basketsOrder;let i = index" title="deplacer" dnd-sortable
+ [sortableIndex]="i" (onDropSuccess)="updateBasketOrder(basket)">
+ <mat-icon color="primary" mat-list-icon class="fa fa-inbox"></mat-icon>
+ <p mat-line>{{i+1}} - {{basket.basket_name}}</p>
+ </mat-list-item>
+ </span>
+ </mat-list>
+
</mat-sidenav>
</mat-sidenav-container>
</div>
\ No newline at end of file
diff --git a/apps/maarch_entreprise/Views/baskets-order-administration.component.html b/apps/maarch_entreprise/Views/baskets-order-administration.component.html
deleted file mode 100644
index 896e4b0d4499055a13dbd87d6ba6efa9d04adeec..0000000000000000000000000000000000000000
--- a/apps/maarch_entreprise/Views/baskets-order-administration.component.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<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 c687ee1ac1ee1180ec8882c02f2689372bc03df4..b974c4e8936d6e61ce898783526807fa2170bdef 100644
--- 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,7 +14,6 @@ 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 doctypes_administration_component_1 = require("./doctypes-administration.component");
var entities_administration_component_1 = require("./entities-administration.component");
@@ -49,7 +48,6 @@ 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/doctypes', component: doctypes_administration_component_1.DoctypesAdministrationComponent },
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 a23e52ab917f8e2fd2a5bc358b7a1b5b87bf9bfa..216332871c5e36bf66b6675aee69aa46ddc52946 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,7 +7,6 @@ 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 { DoctypesAdministrationComponent } from './doctypes-administration.component';
import { EntitiesAdministrationComponent } from './entities-administration.component';
@@ -40,7 +39,6 @@ import { UpdateStatusAdministrationComponent } from './update-status-ad
{ 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/doctypes', component: DoctypesAdministrationComponent },
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 7113fe43b9c6d03f7482a76e9206c16b7d411ec5..8aaaf06a00b39741222ef33940fc1dd8a4335584 100755
--- a/apps/maarch_entreprise/js/angular/app/administration/administration.module.ts
+++ b/apps/maarch_entreprise/js/angular/app/administration/administration.module.ts
@@ -12,7 +12,6 @@ import { GroupsAdministrationComponent, GroupsAdministrationRedirectModalCompone
import { UserAdministrationComponent } from './user-administration.component';
import { GroupAdministrationComponent } from './group-administration.component';
import { BasketsAdministrationComponent } from './baskets-administration.component';
-import { BasketsOrderAdministrationComponent } from './baskets-order-administration.component';
import { BasketAdministrationComponent, BasketAdministrationSettingsModalComponent, BasketAdministrationGroupListModalComponent } from './basket-administration.component';
import { EntitiesAdministrationComponent, EntitiesAdministrationRedirectModalComponent} from './entities-administration.component';
import { EntityAdministrationComponent } from './entity-administration.component';
@@ -49,7 +48,6 @@ import { NotificationAdministrationComponent } from './notification-adm
GroupsAdministrationComponent,
GroupAdministrationComponent,
BasketsAdministrationComponent,
- BasketsOrderAdministrationComponent,
BasketAdministrationComponent,
DoctypesAdministrationComponent,
EntitiesAdministrationComponent,
diff --git a/apps/maarch_entreprise/js/angular/app/administration/baskets-administration.component.js b/apps/maarch_entreprise/js/angular/app/administration/baskets-administration.component.js
index 88c640feb4cca281ba93a14aacb0529344a68e8b..ddb3ea5da3a3a3fbf43bc87a31ac4695f051fcdf 100644
--- a/apps/maarch_entreprise/js/angular/app/administration/baskets-administration.component.js
+++ b/apps/maarch_entreprise/js/angular/app/administration/baskets-administration.component.js
@@ -21,6 +21,7 @@ var BasketsAdministrationComponent = /** @class */ (function () {
this.notify = notify;
this.lang = translate_component_1.LANG;
this.baskets = [];
+ this.basketsOrder = [];
this.loading = false;
this.displayedColumns = ['basket_id', 'basket_name', 'basket_desc', 'actions'];
$j("link[href='merged_css.php']").remove();
@@ -51,6 +52,12 @@ var BasketsAdministrationComponent = /** @class */ (function () {
_this.baskets = data['baskets'];
_this.loading = false;
setTimeout(function () {
+ _this.http.get(_this.coreUrl + "rest/sortedBaskets")
+ .subscribe(function (data) {
+ _this.basketsOrder = data['baskets'];
+ }, function () {
+ location.href = "index.php";
+ });
_this.dataSource = new material_1.MatTableDataSource(_this.baskets);
_this.dataSource.paginator = _this.paginator;
_this.dataSource.sort = _this.sort;
@@ -75,6 +82,21 @@ var BasketsAdministrationComponent = /** @class */ (function () {
});
}
};
+ BasketsAdministrationComponent.prototype.updateBasketOrder = function (currentBasket) {
+ var _this = this;
+ console.log(this.basketsOrder);
+ this.http.put(this.coreUrl + "rest/sortedBaskets/" + currentBasket.basket_id, this.basketsOrder)
+ .subscribe(function (data) {
+ _this.baskets = data['baskets'];
+ _this.notify.success(_this.lang.modificationSaved);
+ }, function (err) {
+ _this.notify.error(err.error.errors);
+ });
+ };
+ __decorate([
+ core_1.ViewChild('snav2'),
+ __metadata("design:type", material_1.MatSidenav)
+ ], BasketsAdministrationComponent.prototype, "sidenav", void 0);
__decorate([
core_1.ViewChild(material_1.MatPaginator),
__metadata("design:type", material_1.MatPaginator)
diff --git a/apps/maarch_entreprise/js/angular/app/administration/baskets-administration.component.ts b/apps/maarch_entreprise/js/angular/app/administration/baskets-administration.component.ts
index cfbec441f08993f4b520646a257f0fbe0cd4836b..37b82a29dad6259425b2364cf0a9aea5b5ecafbb 100644
--- a/apps/maarch_entreprise/js/angular/app/administration/baskets-administration.component.ts
+++ b/apps/maarch_entreprise/js/angular/app/administration/baskets-administration.component.ts
@@ -3,7 +3,7 @@ import { MediaMatcher } from '@angular/cdk/layout';
import { HttpClient } from '@angular/common/http';
import { LANG } from '../translate.component';
import { NotificationService } from '../notification.service';
-import { MatPaginator, MatTableDataSource, MatSort } from '@angular/material';
+import { MatSidenav, MatPaginator, MatTableDataSource, MatSort } from '@angular/material';
declare function $j(selector: any): any;
@@ -22,8 +22,10 @@ export class BasketsAdministrationComponent implements OnInit {
lang: any = LANG;
baskets: any[] = [];
+ basketsOrder: any[] = [];
loading: boolean = false;
+ @ViewChild('snav2') sidenav: MatSidenav;
displayedColumns = ['basket_id', 'basket_name', 'basket_desc', 'actions'];
dataSource: any;
@@ -63,6 +65,12 @@ export class BasketsAdministrationComponent implements OnInit {
this.baskets = data['baskets'];
this.loading = false;
setTimeout(() => {
+ this.http.get(this.coreUrl + "rest/sortedBaskets")
+ .subscribe((data: any) => {
+ this.basketsOrder = data['baskets'];
+ }, () => {
+ location.href = "index.php";
+ });
this.dataSource = new MatTableDataSource(this.baskets);
this.dataSource.paginator = this.paginator;
this.dataSource.sort = this.sort;
@@ -88,4 +96,15 @@ export class BasketsAdministrationComponent implements OnInit {
});
}
}
+
+ updateBasketOrder(currentBasket: any) {
+ console.log(this.basketsOrder);
+ this.http.put(this.coreUrl + "rest/sortedBaskets/" + currentBasket.basket_id, this.basketsOrder)
+ .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/baskets-order-administration.component.js b/apps/maarch_entreprise/js/angular/app/administration/baskets-order-administration.component.js
deleted file mode 100644
index eb9899cd28fe49f1194a7c69b5d719081c79a10b..0000000000000000000000000000000000000000
--- a/apps/maarch_entreprise/js/angular/app/administration/baskets-order-administration.component.js
+++ /dev/null
@@ -1,62 +0,0 @@
-"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
deleted file mode 100644
index b80196bc8843d3f109a75b47025b9abe10ac1de0..0000000000000000000000000000000000000000
--- a/apps/maarch_entreprise/js/angular/app/administration/baskets-order-administration.component.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-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/angularFunctions.js b/apps/maarch_entreprise/js/angularFunctions.js
index 5337f3b2cff9f338ae7002adb6d76816bbb24f64..7b9b815009c64b123d4e132ae1394f929e1a9638 100755
--- a/apps/maarch_entreprise/js/angularFunctions.js
+++ b/apps/maarch_entreprise/js/angularFunctions.js
@@ -10,7 +10,6 @@ function triggerAngular(prodmode, locationToGo) {
'groups-administration-redirect-modal',
'group-administration',
'baskets-administration',
- 'baskets-order-administration',
'basket-administration',
'basket-administration-settings-modal',
'basket-administration-groupList-modal',
diff --git a/src/app/basket/controllers/BasketController.php b/src/app/basket/controllers/BasketController.php
index 19651c63f4665a5c05e731653e707fc1d5b41149..94ee3932fc582764f2f00afff6427ebf3c4e3d99 100644
--- a/src/app/basket/controllers/BasketController.php
+++ b/src/app/basket/controllers/BasketController.php
@@ -1,16 +1,16 @@
<?php
/**
-* Copyright Maarch since 2008 under licence GPLv3.
-* See LICENCE.txt file at the root folder for more details.
-* This file is part of Maarch software.
-*
-*/
+ * Copyright Maarch since 2008 under licence GPLv3.
+ * See LICENCE.txt file at the root folder for more details.
+ * This file is part of Maarch software.
+ */
/**
-* @brief Basket Controller
-* @author dev@maarch.org
-*/
+ * @brief Basket Controller
+ *
+ * @author dev@maarch.org
+ */
namespace Basket\controllers;
@@ -47,7 +47,7 @@ class BasketController
return $response->withStatus(400)->withJson(['errors' => 'Basket not found']);
}
- return $response->withJson(['basket' => $basket]);
+ return $response->withJson(['basket' => $basket]);
}
public function create(Request $request, Response $response)
@@ -81,11 +81,11 @@ class BasketController
BasketModel::create($data);
HistoryController::add([
'tableName' => 'baskets',
- 'recordId' => $data['id'],
+ 'recordId' => $data['id'],
'eventType' => 'ADD',
- 'info' => _BASKET_CREATION . " : {$data['id']}",
- 'moduleId' => 'basket',
- 'eventId' => 'basketCreation',
+ 'info' => _BASKET_CREATION." : {$data['id']}",
+ 'moduleId' => 'basket',
+ 'eventId' => 'basketCreation',
]);
return $response->withJson(['basket' => $data['id']]);
@@ -123,11 +123,11 @@ class BasketController
BasketModel::update($data);
HistoryController::add([
'tableName' => 'baskets',
- 'recordId' => $aArgs['id'],
+ 'recordId' => $aArgs['id'],
'eventType' => 'UP',
- 'info' => _BASKET_MODIFICATION . " : {$aArgs['id']}",
- 'moduleId' => 'basket',
- 'eventId' => 'basketModification',
+ 'info' => _BASKET_MODIFICATION." : {$aArgs['id']}",
+ 'moduleId' => 'basket',
+ 'eventId' => 'basketModification',
]);
return $response->withJson(['success' => 'success']);
@@ -147,11 +147,11 @@ class BasketController
BasketModel::delete(['id' => $aArgs['id']]);
HistoryController::add([
'tableName' => 'baskets',
- 'recordId' => $aArgs['id'],
+ 'recordId' => $aArgs['id'],
'eventType' => 'DEL',
- 'info' => _BASKET_SUPPRESSION . " : {$aArgs['id']}",
- 'moduleId' => 'basket',
- 'eventId' => 'basketSuppression',
+ 'info' => _BASKET_SUPPRESSION." : {$aArgs['id']}",
+ 'moduleId' => 'basket',
+ 'eventId' => 'basketSuppression',
]);
return $response->withJson(['baskets' => BasketModel::get()]);
@@ -164,10 +164,10 @@ class BasketController
}
$baskets = BasketModel::get([
- 'select' => ['basket_id', 'basket_name', 'basket_desc', 'basket_order'],
- 'where' => ['is_visible = ?'],
- 'data' => ['Y'],
- 'orderBy' => ['basket_order']
+ 'select' => ['basket_id', 'basket_name', 'basket_desc', 'basket_order'],
+ 'where' => ['is_visible = ?'],
+ 'data' => ['Y'],
+ 'orderBy' => ['basket_order'],
]);
return $response->withJson(['baskets' => $baskets]);
@@ -186,69 +186,26 @@ class BasketController
$data = $request->getParams();
- $allowedMethods = ['UP', 'DOWN'];
- $allowedPowers = ['ONE', 'ALL'];
- $check = Validator::stringType()->notEmpty()->validate($data['method']) && in_array($data['method'], $allowedMethods);
- $check = $check && Validator::stringType()->notEmpty()->validate($data['power']) && in_array($data['power'], $allowedPowers);
- if (!$check) {
- return $response->withStatus(400)->withJson(['errors' => 'Bad Request']);
- }
-
- $baskets = BasketModel::get([
- 'select' => ['basket_id'],
- 'where' => ['is_visible = ?'],
- 'data' => ['Y'],
- 'orderBy' => ['basket_order']
- ]);
- if (($data['method'] == 'UP' && $baskets[0]['basket_id'] == $aArgs['id']) || ($data['method'] == 'DOWN' && $baskets[count($baskets) - 1]['basket_id'] == $aArgs['id'])) {
- return $response->withStatus(400)->withJson(['errors' => 'Basket is already sorted']);
- }
-
- $basketsToUpdate = [];
- foreach ($baskets as $key => $basket) {
- if ($basket['basket_id'] == $aArgs['id'])
- continue;
- if ($data['method'] == 'UP' && $data['power'] == 'ALL') {
- if ($key == 0) {
- $basketsToUpdate[] = $aArgs['id'];
- }
- $basketsToUpdate[] = $basket['basket_id'];
- } elseif ($data['method'] == 'UP' && $data['power'] == 'ONE') {
- if (!empty($baskets[$key + 1]) && $baskets[$key + 1]['basket_id'] == $aArgs['id']) {
- $basketsToUpdate[] = $aArgs['id'];
- }
- $basketsToUpdate[] = $basket['basket_id'];
- } elseif ($data['method'] == 'DOWN' && $data['power'] == 'ALL') {
- $basketsToUpdate[] = $basket['basket_id'];
- if (count($baskets) == $key + 1) {
- $basketsToUpdate[] = $aArgs['id'];
- }
- } elseif ($data['method'] == 'DOWN' && $data['power'] == 'ONE') {
- $basketsToUpdate[] = $basket['basket_id'];
- if (!empty($baskets[$key - 1]) && $baskets[$key - 1]['basket_id'] == $aArgs['id']) {
- $basketsToUpdate[] = $aArgs['id'];
- }
+ foreach ($data as $key => $basketToUpdate) {
+ if ($key != $basketToUpdate['basket_order']) {
+ BasketModel::updateOrder(['id' => $basketToUpdate['basket_id'], 'order' => $key]);
}
}
- foreach ($basketsToUpdate as $key => $basketToUpdate) {
- BasketModel::updateOrder(['id' => $basketToUpdate, 'order' => $key + 1]);
- }
-
HistoryController::add([
'tableName' => 'baskets',
- 'recordId' => $aArgs['id'],
+ 'recordId' => $aArgs['id'],
'eventType' => 'UP',
- 'info' => _BASKETS_SORT_MODIFICATION,
- 'moduleId' => 'basket',
- 'eventId' => 'basketModification',
+ 'info' => _BASKETS_SORT_MODIFICATION,
+ 'moduleId' => 'basket',
+ 'eventId' => 'basketModification',
]);
$baskets = BasketModel::get([
- 'select' => ['basket_id', 'basket_name', 'basket_desc', 'basket_order'],
- 'where' => ['is_visible = ?'],
- 'data' => ['Y'],
- 'orderBy' => ['basket_order']
+ 'select' => ['basket_id', 'basket_name', 'basket_desc', 'basket_order'],
+ 'where' => ['is_visible = ?'],
+ 'data' => ['Y'],
+ 'orderBy' => ['basket_order'],
]);
return $response->withJson(['baskets' => $baskets]);
@@ -271,9 +228,9 @@ class BasketController
foreach ($groups as $key => $group) {
$actionsForGroup = $allActions;
$actions = BasketModel::getActionsForGroupById([
- 'id' => $aArgs['id'],
- 'groupId' => $group['group_id'],
- 'select' => ['id_action', 'where_clause', 'used_in_basketlist', 'used_in_action_page', 'default_action_list']
+ 'id' => $aArgs['id'],
+ 'groupId' => $group['group_id'],
+ 'select' => ['id_action', 'where_clause', 'used_in_basketlist', 'used_in_action_page', 'default_action_list'],
]);
$actionIds = [];
foreach ($actions as $action) {
@@ -283,14 +240,14 @@ class BasketController
$redirects = [];
if (!empty($actionIds)) {
$statuses = BasketModel::getGroupActionStatus([
- 'select' => ['status_id', 'action_id'],
- 'where' => ['basket_id = ?', 'group_id = ?', 'action_id in (?)'],
- 'data' => [$aArgs['id'], $group['group_id'], $actionIds]
+ 'select' => ['status_id', 'action_id'],
+ 'where' => ['basket_id = ?', 'group_id = ?', 'action_id in (?)'],
+ 'data' => [$aArgs['id'], $group['group_id'], $actionIds],
]);
$redirects = BasketModel::getGroupActionRedirect([
- 'select' => ['entity_id', 'action_id', 'keyword', 'redirect_mode'],
- 'where' => ['basket_id = ?', 'group_id = ?', 'action_id in (?)'],
- 'data' => [$aArgs['id'], $group['group_id'], $actionIds]
+ 'select' => ['entity_id', 'action_id', 'keyword', 'redirect_mode'],
+ 'where' => ['basket_id = ?', 'group_id = ?', 'action_id in (?)'],
+ 'data' => [$aArgs['id'], $group['group_id'], $actionIds],
]);
}
foreach ($actions as $actionKey => $action) {
@@ -354,7 +311,7 @@ class BasketController
if (!$check) {
return $response->withStatus(400)->withJson(['errors' => 'Bad Request']);
}
- $data['groupActions'] = BasketController::checkGroupActions(['groupActions' => $data['groupActions']]);
+ $data['groupActions'] = self::checkGroupActions(['groupActions' => $data['groupActions']]);
if (!empty($data['groupActions']['errors'])) {
return $response->withStatus(400)->withJson(['errors' => $data['groupActions']['errors']]);
}
@@ -367,34 +324,34 @@ class BasketController
foreach ($data['groupActions'] as $groupAction) {
if ($groupAction['checked']) {
BasketModel::createGroupAction([
- 'id' => $aArgs['id'],
- 'groupId' => $data['group_id'],
- 'actionId' => $groupAction['id'],
- 'whereClause' => $groupAction['where_clause'],
- 'usedInBasketlist' => $groupAction['used_in_basketlist'],
- 'usedInActionPage' => $groupAction['used_in_action_page'],
- 'defaultActionList' => $groupAction['default_action_list']
+ 'id' => $aArgs['id'],
+ 'groupId' => $data['group_id'],
+ 'actionId' => $groupAction['id'],
+ 'whereClause' => $groupAction['where_clause'],
+ 'usedInBasketlist' => $groupAction['used_in_basketlist'],
+ 'usedInActionPage' => $groupAction['used_in_action_page'],
+ 'defaultActionList' => $groupAction['default_action_list'],
]);
if (!empty($groupAction['statuses'])) {
foreach ($groupAction['statuses'] as $status) {
BasketModel::createGroupActionStatus([
- 'id' => $aArgs['id'],
- 'groupId' => $data['group_id'],
- 'actionId' => $groupAction['id'],
- 'statusId' => $status
+ 'id' => $aArgs['id'],
+ 'groupId' => $data['group_id'],
+ 'actionId' => $groupAction['id'],
+ 'statusId' => $status,
]);
}
}
if (!empty($groupAction['redirects'])) {
foreach ($groupAction['redirects'] as $redirect) {
BasketModel::createGroupActionRedirect([
- 'id' => $aArgs['id'],
- 'groupId' => $data['group_id'],
- 'actionId' => $groupAction['id'],
- 'entityId' => $redirect['entity_id'],
- 'keyword' => $redirect['keyword'],
- 'redirectMode' => $redirect['redirect_mode']
+ 'id' => $aArgs['id'],
+ 'groupId' => $data['group_id'],
+ 'actionId' => $groupAction['id'],
+ 'entityId' => $redirect['entity_id'],
+ 'keyword' => $redirect['keyword'],
+ 'redirectMode' => $redirect['redirect_mode'],
]);
}
}
@@ -402,11 +359,11 @@ class BasketController
}
HistoryController::add([
'tableName' => 'baskets',
- 'recordId' => $aArgs['id'],
+ 'recordId' => $aArgs['id'],
'eventType' => 'UP',
- 'info' => _BASKET_GROUP_CREATION . " : {$aArgs['id']}",
- 'moduleId' => 'basket',
- 'eventId' => 'basketModification',
+ 'info' => _BASKET_GROUP_CREATION." : {$aArgs['id']}",
+ 'moduleId' => 'basket',
+ 'eventId' => 'basketModification',
]);
return $response->withJson(['success' => 'success']);
@@ -430,7 +387,7 @@ class BasketController
if (!$check) {
return $response->withStatus(400)->withJson(['errors' => 'Bad Request']);
}
- $data['groupActions'] = BasketController::checkGroupActions(['groupActions' => $data['groupActions']]);
+ $data['groupActions'] = self::checkGroupActions(['groupActions' => $data['groupActions']]);
if (!empty($data['groupActions']['errors'])) {
return $response->withStatus(400)->withJson(['errors' => $data['groupActions']['errors']]);
}
@@ -445,34 +402,34 @@ class BasketController
foreach ($data['groupActions'] as $groupAction) {
if ($groupAction['checked']) {
BasketModel::createGroupAction([
- 'id' => $aArgs['id'],
- 'groupId' => $aArgs['groupId'],
- 'actionId' => $groupAction['id'],
- 'whereClause' => $groupAction['where_clause'],
- 'usedInBasketlist' => $groupAction['used_in_basketlist'],
- 'usedInActionPage' => $groupAction['used_in_action_page'],
- 'defaultActionList' => $groupAction['default_action_list']
+ 'id' => $aArgs['id'],
+ 'groupId' => $aArgs['groupId'],
+ 'actionId' => $groupAction['id'],
+ 'whereClause' => $groupAction['where_clause'],
+ 'usedInBasketlist' => $groupAction['used_in_basketlist'],
+ 'usedInActionPage' => $groupAction['used_in_action_page'],
+ 'defaultActionList' => $groupAction['default_action_list'],
]);
if (!empty($groupAction['statuses'])) {
foreach ($groupAction['statuses'] as $status) {
BasketModel::createGroupActionStatus([
- 'id' => $aArgs['id'],
- 'groupId' => $aArgs['groupId'],
- 'actionId' => $groupAction['id'],
- 'statusId' => $status
+ 'id' => $aArgs['id'],
+ 'groupId' => $aArgs['groupId'],
+ 'actionId' => $groupAction['id'],
+ 'statusId' => $status,
]);
}
}
if (!empty($groupAction['redirects'])) {
foreach ($groupAction['redirects'] as $redirect) {
BasketModel::createGroupActionRedirect([
- 'id' => $aArgs['id'],
- 'groupId' => $aArgs['groupId'],
- 'actionId' => $groupAction['id'],
- 'entityId' => $redirect['entity_id'],
- 'keyword' => $redirect['keyword'],
- 'redirectMode' => $redirect['redirect_mode']
+ 'id' => $aArgs['id'],
+ 'groupId' => $aArgs['groupId'],
+ 'actionId' => $groupAction['id'],
+ 'entityId' => $redirect['entity_id'],
+ 'keyword' => $redirect['keyword'],
+ 'redirectMode' => $redirect['redirect_mode'],
]);
}
}
@@ -480,11 +437,11 @@ class BasketController
}
HistoryController::add([
'tableName' => 'baskets',
- 'recordId' => $aArgs['id'],
+ 'recordId' => $aArgs['id'],
'eventType' => 'UP',
- 'info' => _BASKET_GROUP_MODIFICATION . " : {$aArgs['id']}",
- 'moduleId' => 'basket',
- 'eventId' => 'basketModification',
+ 'info' => _BASKET_GROUP_MODIFICATION." : {$aArgs['id']}",
+ 'moduleId' => 'basket',
+ 'eventId' => 'basketModification',
]);
return $response->withJson(['success' => 'success']);
@@ -504,11 +461,11 @@ class BasketController
BasketModel::deleteGroup(['id' => $aArgs['id'], 'groupId' => $aArgs['groupId']]);
HistoryController::add([
'tableName' => 'baskets',
- 'recordId' => $aArgs['id'],
+ 'recordId' => $aArgs['id'],
'eventType' => 'UP',
- 'info' => _BASKET_GROUP_SUPPRESSION . " : {$aArgs['id']}",
- 'moduleId' => 'basket',
- 'eventId' => 'basketModification',
+ 'info' => _BASKET_GROUP_SUPPRESSION." : {$aArgs['id']}",
+ 'moduleId' => 'basket',
+ 'eventId' => 'basketModification',
]);
return $response->withJson(['success' => 'success']);
diff --git a/src/app/basket/models/BasketModelAbstract.php b/src/app/basket/models/BasketModelAbstract.php
index 8c65f3d9744d2a9150a929a6dfa8e6ef8f6df361..f6a6d2d6b12b7554535c057ff969a8dc238ba296 100644
--- a/src/app/basket/models/BasketModelAbstract.php
+++ b/src/app/basket/models/BasketModelAbstract.php
@@ -1,16 +1,16 @@
<?php
/**
-* Copyright Maarch since 2008 under licence GPLv3.
-* See LICENCE.txt file at the root folder for more details.
-* This file is part of Maarch software.
-*
-*/
+ * Copyright Maarch since 2008 under licence GPLv3.
+ * See LICENCE.txt file at the root folder for more details.
+ * This file is part of Maarch software.
+ */
/**
-* @brief BasketModelAbstract
-* @author <dev@maarch.org>
-*/
+ * @brief BasketModelAbstract
+ *
+ * @author <dev@maarch.org>
+ */
namespace Basket\models;
@@ -28,11 +28,11 @@ class BasketModelAbstract
ValidatorModel::arrayType($aArgs, ['select', 'where', 'data', 'orderBy']);
$aBaskets = DatabaseModel::select([
- 'select' => empty($aArgs['select']) ? ['*'] : $aArgs['select'],
- 'table' => ['baskets'],
- 'where' => $aArgs['where'],
- 'data' => $aArgs['data'],
- 'order_by' => $aArgs['orderBy']
+ 'select' => empty($aArgs['select']) ? ['*'] : $aArgs['select'],
+ 'table' => ['baskets'],
+ 'where' => $aArgs['where'],
+ 'data' => $aArgs['data'],
+ 'order_by' => $aArgs['orderBy'],
]);
return $aBaskets;
@@ -45,10 +45,10 @@ class BasketModelAbstract
ValidatorModel::arrayType($aArgs, ['select']);
$aBasket = DatabaseModel::select([
- 'select' => empty($aArgs['select']) ? ['*'] : $aArgs['select'],
- 'table' => ['baskets'],
- 'where' => ['basket_id = ?'],
- 'data' => [$aArgs['id']]
+ 'select' => empty($aArgs['select']) ? ['*'] : $aArgs['select'],
+ 'table' => ['baskets'],
+ 'where' => ['basket_id = ?'],
+ 'data' => [$aArgs['id']],
]);
return $aBasket[0];
@@ -60,18 +60,18 @@ class BasketModelAbstract
ValidatorModel::stringType($aArgs, ['id', 'basket_name', 'color', 'basket_desc', 'clause', 'isVisible', 'isFolderBasket', 'flagNotif']);
DatabaseModel::insert([
- 'table' => 'baskets',
+ 'table' => 'baskets',
'columnsValues' => [
- 'basket_id' => $aArgs['id'],
- 'basket_name' => $aArgs['basket_name'],
- 'basket_desc' => $aArgs['basket_desc'],
- 'basket_clause' => $aArgs['clause'],
- 'is_visible' => $aArgs['isVisible'],
- 'is_folder_basket' => $aArgs['isFolderBasket'],
- 'flag_notif' => $aArgs['flagNotif'],
- 'color' => $aArgs['color'],
- 'coll_id' => 'letterbox_coll',
- ]
+ 'basket_id' => $aArgs['id'],
+ 'basket_name' => $aArgs['basket_name'],
+ 'basket_desc' => $aArgs['basket_desc'],
+ 'basket_clause' => $aArgs['clause'],
+ 'is_visible' => $aArgs['isVisible'],
+ 'is_folder_basket' => $aArgs['isFolderBasket'],
+ 'flag_notif' => $aArgs['flagNotif'],
+ 'color' => $aArgs['color'],
+ 'coll_id' => 'letterbox_coll',
+ ],
]);
return true;
@@ -83,19 +83,19 @@ class BasketModelAbstract
ValidatorModel::stringType($aArgs, ['id', 'basket_name', 'color', 'basket_desc', 'clause', 'isVisible', 'isFolderBasket', 'flagNotif']);
DatabaseModel::update([
- 'table' => 'baskets',
- 'set' => [
- 'basket_name' => $aArgs['basket_name'],
- 'basket_desc' => $aArgs['basket_desc'],
- 'basket_clause' => $aArgs['clause'],
- 'is_visible' => $aArgs['isVisible'],
- 'is_folder_basket' => $aArgs['isFolderBasket'],
- 'flag_notif' => $aArgs['flagNotif'],
- 'color' => $aArgs['color'],
- 'coll_id' => 'letterbox_coll',
+ 'table' => 'baskets',
+ 'set' => [
+ 'basket_name' => $aArgs['basket_name'],
+ 'basket_desc' => $aArgs['basket_desc'],
+ 'basket_clause' => $aArgs['clause'],
+ 'is_visible' => $aArgs['isVisible'],
+ 'is_folder_basket' => $aArgs['isFolderBasket'],
+ 'flag_notif' => $aArgs['flagNotif'],
+ 'color' => $aArgs['color'],
+ 'coll_id' => 'letterbox_coll',
],
- 'where' => ['basket_id = ?'],
- 'data' => [$aArgs['id']]
+ 'where' => ['basket_id = ?'],
+ 'data' => [$aArgs['id']],
]);
return true;
@@ -103,17 +103,17 @@ class BasketModelAbstract
public static function updateOrder(array $aArgs)
{
- ValidatorModel::notEmpty($aArgs, ['id', 'order']);
+ ValidatorModel::notEmpty($aArgs, ['id']);
ValidatorModel::stringType($aArgs, ['id']);
ValidatorModel::intVal($aArgs, ['order']);
DatabaseModel::update([
- 'table' => 'baskets',
- 'set' => [
- 'basket_order' => $aArgs['order']
+ 'table' => 'baskets',
+ 'set' => [
+ 'basket_order' => $aArgs['order'],
],
- 'where' => ['basket_id = ?'],
- 'data' => [$aArgs['id']]
+ 'where' => ['basket_id = ?'],
+ 'data' => [$aArgs['id']],
]);
return true;
@@ -127,32 +127,32 @@ class BasketModelAbstract
DatabaseModel::delete([
'table' => 'baskets',
'where' => ['basket_id = ?'],
- 'data' => [$aArgs['id']]
+ 'data' => [$aArgs['id']],
]);
DatabaseModel::delete([
'table' => 'groupbasket',
'where' => ['basket_id = ?'],
- 'data' => [$aArgs['id']]
+ 'data' => [$aArgs['id']],
]);
DatabaseModel::delete([
'table' => 'groupbasket_redirect',
'where' => ['basket_id = ?'],
- 'data' => [$aArgs['id']]
+ 'data' => [$aArgs['id']],
]);
DatabaseModel::delete([
'table' => 'groupbasket_status',
'where' => ['basket_id = ?'],
- 'data' => [$aArgs['id']]
+ 'data' => [$aArgs['id']],
]);
DatabaseModel::delete([
'table' => 'actions_groupbaskets',
'where' => ['basket_id = ?'],
- 'data' => [$aArgs['id']]
+ 'data' => [$aArgs['id']],
]);
DatabaseModel::delete([
'table' => 'user_baskets_secondary',
'where' => ['basket_id = ?'],
- 'data' => [$aArgs['id']]
+ 'data' => [$aArgs['id']],
]);
return true;
@@ -165,11 +165,11 @@ class BasketModelAbstract
ValidatorModel::arrayType($aArgs, ['select', 'orderBy']);
$aGroups = DatabaseModel::select([
- 'select' => empty($aArgs['select']) ? ['*'] : $aArgs['select'],
- 'table' => ['groupbasket'],
- 'where' => ['basket_id = ?'],
- 'data' => [$aArgs['id']],
- 'order_by' => $aArgs['orderBy']
+ 'select' => empty($aArgs['select']) ? ['*'] : $aArgs['select'],
+ 'table' => ['groupbasket'],
+ 'where' => ['basket_id = ?'],
+ 'data' => [$aArgs['id']],
+ 'order_by' => $aArgs['orderBy'],
]);
return $aGroups;
@@ -181,12 +181,12 @@ class BasketModelAbstract
ValidatorModel::stringType($aArgs, ['id', 'groupId', 'resultPage']);
DatabaseModel::insert([
- 'table' => 'groupbasket',
+ 'table' => 'groupbasket',
'columnsValues' => [
- 'basket_id' => $aArgs['id'],
- 'group_id' => $aArgs['groupId'],
- 'result_page' => $aArgs['resultPage']
- ]
+ 'basket_id' => $aArgs['id'],
+ 'group_id' => $aArgs['groupId'],
+ 'result_page' => $aArgs['resultPage'],
+ ],
]);
return true;
@@ -199,16 +199,16 @@ class BasketModelAbstract
ValidatorModel::intVal($aArgs, ['actionId']);
DatabaseModel::insert([
- 'table' => 'actions_groupbaskets',
+ 'table' => 'actions_groupbaskets',
'columnsValues' => [
- 'id_action' => $aArgs['actionId'],
- 'where_clause' => $aArgs['whereClause'],
- 'group_id' => $aArgs['groupId'],
- 'basket_id' => $aArgs['id'],
- 'used_in_basketlist' => $aArgs['usedInBasketlist'],
- 'used_in_action_page' => $aArgs['usedInActionPage'],
- 'default_action_list' => $aArgs['defaultActionList'],
- ]
+ 'id_action' => $aArgs['actionId'],
+ 'where_clause' => $aArgs['whereClause'],
+ 'group_id' => $aArgs['groupId'],
+ 'basket_id' => $aArgs['id'],
+ 'used_in_basketlist' => $aArgs['usedInBasketlist'],
+ 'used_in_action_page' => $aArgs['usedInActionPage'],
+ 'default_action_list' => $aArgs['defaultActionList'],
+ ],
]);
return true;
@@ -220,10 +220,10 @@ class BasketModelAbstract
ValidatorModel::arrayType($aArgs, ['select', 'where', 'data']);
$aRedirects = DatabaseModel::select([
- 'select' => $aArgs['select'],
- 'table' => ['groupbasket_redirect'],
- 'where' => $aArgs['where'],
- 'data' => $aArgs['data']
+ 'select' => $aArgs['select'],
+ 'table' => ['groupbasket_redirect'],
+ 'where' => $aArgs['where'],
+ 'data' => $aArgs['data'],
]);
return $aRedirects;
@@ -236,15 +236,15 @@ class BasketModelAbstract
ValidatorModel::intVal($aArgs, ['actionId']);
DatabaseModel::insert([
- 'table' => 'groupbasket_redirect',
+ 'table' => 'groupbasket_redirect',
'columnsValues' => [
- 'action_id' => $aArgs['actionId'],
- 'group_id' => $aArgs['groupId'],
- 'basket_id' => $aArgs['id'],
- 'entity_id' => $aArgs['entityId'],
- 'keyword' => $aArgs['keyword'],
- 'redirect_mode' => $aArgs['redirectMode']
- ]
+ 'action_id' => $aArgs['actionId'],
+ 'group_id' => $aArgs['groupId'],
+ 'basket_id' => $aArgs['id'],
+ 'entity_id' => $aArgs['entityId'],
+ 'keyword' => $aArgs['keyword'],
+ 'redirect_mode' => $aArgs['redirectMode'],
+ ],
]);
return true;
@@ -257,9 +257,9 @@ class BasketModelAbstract
DatabaseModel::update([
'table' => 'groupbasket_redirect',
- 'set' => $aArgs['set'],
+ 'set' => $aArgs['set'],
'where' => $aArgs['where'],
- 'data' => $aArgs['data']
+ 'data' => $aArgs['data'],
]);
return true;
@@ -271,10 +271,10 @@ class BasketModelAbstract
ValidatorModel::arrayType($aArgs, ['select', 'where', 'data']);
$aStatuses = DatabaseModel::select([
- 'select' => $aArgs['select'],
- 'table' => ['groupbasket_status'],
- 'where' => $aArgs['where'],
- 'data' => $aArgs['data']
+ 'select' => $aArgs['select'],
+ 'table' => ['groupbasket_status'],
+ 'where' => $aArgs['where'],
+ 'data' => $aArgs['data'],
]);
return $aStatuses;
@@ -287,13 +287,13 @@ class BasketModelAbstract
ValidatorModel::intVal($aArgs, ['actionId']);
DatabaseModel::insert([
- 'table' => 'groupbasket_status',
+ 'table' => 'groupbasket_status',
'columnsValues' => [
- 'action_id' => $aArgs['actionId'],
- 'group_id' => $aArgs['groupId'],
- 'basket_id' => $aArgs['id'],
- 'status_id' => $aArgs['statusId']
- ]
+ 'action_id' => $aArgs['actionId'],
+ 'group_id' => $aArgs['groupId'],
+ 'basket_id' => $aArgs['id'],
+ 'status_id' => $aArgs['statusId'],
+ ],
]);
return true;
@@ -307,22 +307,22 @@ class BasketModelAbstract
DatabaseModel::delete([
'table' => 'groupbasket',
'where' => ['basket_id = ?', 'group_id = ?'],
- 'data' => [$aArgs['id'], $aArgs['groupId']]
+ 'data' => [$aArgs['id'], $aArgs['groupId']],
]);
DatabaseModel::delete([
'table' => 'actions_groupbaskets',
'where' => ['basket_id = ?', 'group_id = ?'],
- 'data' => [$aArgs['id'], $aArgs['groupId']]
+ 'data' => [$aArgs['id'], $aArgs['groupId']],
]);
DatabaseModel::delete([
'table' => 'groupbasket_redirect',
'where' => ['basket_id = ?', 'group_id = ?'],
- 'data' => [$aArgs['id'], $aArgs['groupId']]
+ 'data' => [$aArgs['id'], $aArgs['groupId']],
]);
DatabaseModel::delete([
'table' => 'groupbasket_status',
'where' => ['basket_id = ?', 'group_id = ?'],
- 'data' => [$aArgs['id'], $aArgs['groupId']]
+ 'data' => [$aArgs['id'], $aArgs['groupId']],
]);
return true;
@@ -335,10 +335,10 @@ class BasketModelAbstract
ValidatorModel::arrayType($aArgs, ['select']);
$aGroups = DatabaseModel::select([
- 'select' => empty($aArgs['select']) ? ['*'] : $aArgs['select'],
- 'table' => ['actions_groupbaskets'],
- 'where' => ['basket_id = ?', 'group_id = ?'],
- 'data' => [$aArgs['id'], $aArgs['groupId']]
+ 'select' => empty($aArgs['select']) ? ['*'] : $aArgs['select'],
+ 'table' => ['actions_groupbaskets'],
+ 'where' => ['basket_id = ?', 'group_id = ?'],
+ 'data' => [$aArgs['id'], $aArgs['groupId']],
]);
return $aGroups;
@@ -367,10 +367,10 @@ class BasketModelAbstract
ValidatorModel::arrayType($aArgs, ['select']);
$aBasket = DatabaseModel::select([
- 'select' => ['basket_clause', 'basket_res_order'],
- 'table' => ['baskets'],
- 'where' => ['basket_id = ?'],
- 'data' => [$aArgs['basketId']]
+ 'select' => ['basket_clause', 'basket_res_order'],
+ 'table' => ['baskets'],
+ 'where' => ['basket_id = ?'],
+ 'data' => [$aArgs['basketId']],
]);
if (empty($aBasket[0]) || empty($aBasket[0]['basket_clause'])) {
@@ -380,9 +380,9 @@ class BasketModelAbstract
$where = PreparedClauseController::getPreparedClause(['clause' => $aBasket[0]['basket_clause'], 'userId' => $aArgs['userId']]);
$aResList = ResModel::getOnView([
- 'select' => $aArgs['select'],
- 'where' => [$where],
- 'orderBy' => empty($aBasket[0]['basket_res_order']) ? ['creation_date DESC'] : [$aBasket[0]['basket_res_order']],
+ 'select' => $aArgs['select'],
+ 'where' => [$where],
+ 'orderBy' => empty($aBasket[0]['basket_res_order']) ? ['creation_date DESC'] : [$aBasket[0]['basket_res_order']],
]);
return $aResList;
@@ -406,24 +406,24 @@ class BasketModelAbstract
$data = [$groupIds];
if (!empty($aArgs['unneededBasketId'])) {
$where[] = 'groupbasket.basket_id not in (?)';
- $data[] = $aArgs['unneededBasketId'];
+ $data[] = $aArgs['unneededBasketId'];
}
$aBaskets = DatabaseModel::select([
- 'select' => ['groupbasket.basket_id', 'group_id', 'basket_name', 'basket_desc', 'basket_clause'],
- 'table' => ['groupbasket, baskets'],
- 'where' => $where,
- 'data' => $data,
- 'order_by' => ['group_id, basket_order, basket_name']
+ 'select' => ['groupbasket.basket_id', 'group_id', 'basket_name', 'basket_desc', 'basket_clause'],
+ 'table' => ['groupbasket, baskets'],
+ 'where' => $where,
+ 'data' => $data,
+ 'order_by' => ['group_id, basket_order, basket_name'],
]);
foreach ($aBaskets as $key => $value) {
$aBaskets[$key]['is_virtual'] = 'N';
$aBaskets[$key]['basket_owner'] = $aArgs['userId'];
$aBaskets2 = DatabaseModel::select([
- 'select' => ['new_user'],
- 'table' => ['user_abs'],
- 'where' => ['user_abs = ?', 'basket_id = ?'],
- 'data' => [$aArgs['userId'],$value['basket_id']],
+ 'select' => ['new_user'],
+ 'table' => ['user_abs'],
+ 'where' => ['user_abs = ?', 'basket_id = ?'],
+ 'data' => [$aArgs['userId'], $value['basket_id']],
]);
$aBaskets[$key]['userToDisplay'] = UserModel::getLabelledUserById(['userId' => $aBaskets2[0]['new_user']]);
$aBaskets[$key]['enabled'] = true;
@@ -440,11 +440,11 @@ class BasketModelAbstract
ValidatorModel::stringType($aArgs, ['userId']);
$aBaskets = DatabaseModel::select([
- 'select' => ['ba.basket_id', 'ba.basket_name', 'ua.user_abs', 'ua.basket_owner', 'ua.is_virtual'],
- 'table' => ['baskets ba, user_abs ua'],
- 'where' => ['ua.new_user = ?', 'ua.basket_id = ba.basket_id'],
- 'data' => [$aArgs['userId']],
- 'order_by' => ['ba.basket_order, ba.basket_name']
+ 'select' => ['ba.basket_id', 'ba.basket_name', 'ua.user_abs', 'ua.basket_owner', 'ua.is_virtual'],
+ 'table' => ['baskets ba, user_abs ua'],
+ 'where' => ['ua.new_user = ?', 'ua.basket_id = ba.basket_id'],
+ 'data' => [$aArgs['userId']],
+ 'order_by' => ['ba.basket_order, ba.basket_name'],
]);
foreach ($aBaskets as $key => $value) {
@@ -460,14 +460,14 @@ class BasketModelAbstract
ValidatorModel::stringType($aArgs, ['userAbs', 'newUser', 'basketId', 'basketOwner', 'isVirtual']);
DatabaseModel::insert([
- 'table' => 'user_abs',
+ 'table' => 'user_abs',
'columnsValues' => [
- 'user_abs' => $aArgs['userAbs'],
- 'new_user' => $aArgs['newUser'],
- 'basket_id' => $aArgs['basketId'],
- 'basket_owner' => $aArgs['basketOwner'],
- 'is_virtual' => $aArgs['isVirtual']
- ]
+ 'user_abs' => $aArgs['userAbs'],
+ 'new_user' => $aArgs['newUser'],
+ 'basket_id' => $aArgs['basketId'],
+ 'basket_owner' => $aArgs['basketOwner'],
+ 'is_virtual' => $aArgs['isVirtual'],
+ ],
]);
return true;
@@ -479,12 +479,12 @@ class BasketModelAbstract
ValidatorModel::stringType($aArgs, ['userId']);
DatabaseModel::update([
- 'table' => 'user_abs',
- 'set' => [
- 'new_user' => $aArgs['newUser']
+ 'table' => 'user_abs',
+ 'set' => [
+ 'new_user' => $aArgs['newUser'],
],
- 'where' => ['basket_id = ?', 'basket_owner = ?', 'user_abs = ?', 'new_user = ?'],
- 'data' => [$aArgs['basketId'], $aArgs['basketOwner'], $aArgs['userAbs'], $aArgs['userId']]
+ 'where' => ['basket_id = ?', 'basket_owner = ?', 'user_abs = ?', 'new_user = ?'],
+ 'data' => [$aArgs['basketId'], $aArgs['basketOwner'], $aArgs['userAbs'], $aArgs['userId']],
]);
return true;
@@ -498,7 +498,7 @@ class BasketModelAbstract
DatabaseModel::delete([
'table' => 'user_abs',
'where' => ['(user_abs = ? OR basket_owner = ?)', 'basket_id = ?'],
- 'data' => [$aArgs['userId'], $aArgs['userId'], $aArgs['basketId']]
+ 'data' => [$aArgs['userId'], $aArgs['userId'], $aArgs['basketId']],
]);
return true;
@@ -510,18 +510,18 @@ class BasketModelAbstract
ValidatorModel::stringType($aArgs, ['userId']);
$aBaskets = DatabaseModel::select([
- 'select' => ['ba.basket_id', 'ba.basket_name', 'ua.new_user', 'ua.basket_owner'],
- 'table' => ['baskets ba, user_abs ua'],
- 'where' => ['ua.user_abs = ?', 'ua.basket_id = ba.basket_id'],
- 'data' => [$aArgs['userId']],
- 'order_by' => ['ua.system_id']
+ 'select' => ['ba.basket_id', 'ba.basket_name', 'ua.new_user', 'ua.basket_owner'],
+ 'table' => ['baskets ba, user_abs ua'],
+ 'where' => ['ua.user_abs = ?', 'ua.basket_id = ba.basket_id'],
+ 'data' => [$aArgs['userId']],
+ 'order_by' => ['ua.system_id'],
]);
foreach ($aBaskets as $key => $value) {
$user = UserModel::getByUserId(['userId' => $value['new_user'], 'select' => ['firstname', 'lastname']]);
- $aBaskets[$key]['userToDisplay'] = "{$user['firstname']} {$user['lastname']}";
+ $aBaskets[$key]['userToDisplay'] = "{$user['firstname']} {$user['lastname']}";
$aBaskets[$key]['userIdRedirection'] = $value['new_user'];
- $aBaskets[$key]['user'] = "{$user['firstname']} {$user['lastname']}" ;
+ $aBaskets[$key]['user'] = "{$user['firstname']} {$user['lastname']}";
}
return $aBaskets;
@@ -539,17 +539,17 @@ class BasketModelAbstract
$groups = UserModel::getGroupsByUserId(['userId' => $aArgs['userId']]);
foreach ($groups as $group) {
$baskets = DatabaseModel::select([
- 'select' => ['baskets.basket_id', 'baskets.basket_name', 'baskets.color'],
- 'table' => ['groupbasket, baskets'],
- 'where' => ['groupbasket.basket_id = baskets.basket_id', 'groupbasket.group_id = ?', 'baskets.is_visible = ?', 'baskets.basket_id != ?'],
- 'data' => [$group['group_id'], 'Y', 'IndexingBasket'],
- 'order_by' => ['baskets.basket_order', 'baskets.basket_name']
+ 'select' => ['baskets.basket_id', 'baskets.basket_name', 'baskets.color'],
+ 'table' => ['groupbasket, baskets'],
+ 'where' => ['groupbasket.basket_id = baskets.basket_id', 'groupbasket.group_id = ?', 'baskets.is_visible = ?', 'baskets.basket_id != ?'],
+ 'data' => [$group['group_id'], 'Y', 'IndexingBasket'],
+ 'order_by' => ['baskets.basket_order', 'baskets.basket_name'],
]);
$coloredBaskets = DatabaseModel::select([
- 'select' => ['basket_id', 'color'],
- 'table' => ['users_baskets'],
- 'where' => ['user_serial_id = ?', 'group_id = ?', 'color is not null'],
- 'data' => [$user['id'], $group['group_id']]
+ 'select' => ['basket_id', 'color'],
+ 'table' => ['users_baskets'],
+ 'where' => ['user_serial_id = ?', 'group_id = ?', 'color is not null'],
+ 'data' => [$user['id'], $group['group_id']],
]);
foreach ($baskets as $kBasket => $basket) {
@@ -564,9 +564,9 @@ class BasketModelAbstract
}
$regroupedBaskets[] = [
- 'groupId' => $group['group_id'],
- 'groupDesc' => $group['group_desc'],
- 'baskets' => $baskets
+ 'groupId' => $group['group_id'],
+ 'groupDesc' => $group['group_desc'],
+ 'baskets' => $baskets,
];
}
@@ -581,10 +581,10 @@ class BasketModelAbstract
$user = UserModel::getByUserId(['userId' => $aArgs['userId'], 'select' => ['id']]);
$coloredBaskets = DatabaseModel::select([
- 'select' => ['basket_id', 'group_id', 'color'],
- 'table' => ['users_baskets'],
- 'where' => ['user_serial_id = ?', 'color is not null'],
- 'data' => [$user['id']]
+ 'select' => ['basket_id', 'group_id', 'color'],
+ 'table' => ['users_baskets'],
+ 'where' => ['user_serial_id = ?', 'color is not null'],
+ 'data' => [$user['id']],
]);
return $coloredBaskets;
@@ -606,11 +606,11 @@ class BasketModelAbstract
$loadedXml = simplexml_load_file($path);
if ($loadedXml) {
foreach ($loadedXml->BASKETPAGE as $value) {
- if (empty($aArgs['unneeded']) || !in_array((string)$value->ID, $aArgs['unneeded'])) {
+ if (empty($aArgs['unneeded']) || !in_array((string) $value->ID, $aArgs['unneeded'])) {
$basketPages[] = [
- 'id' => (string)$value->ID,
- 'label' => constant((string)$value->LABEL),
- 'name' => (string)$value->NAME
+ 'id' => (string) $value->ID,
+ 'label' => constant((string) $value->LABEL),
+ 'name' => (string) $value->NAME,
];
}
}
@@ -619,4 +619,4 @@ class BasketModelAbstract
return $basketPages;
}
-}
\ No newline at end of file
+}