diff --git a/apps/maarch_entreprise/Views/basket-administration.component.html b/apps/maarch_entreprise/Views/basket-administration.component.html index 549dc9a047c382fe92ac1c0ebee7a553055e68ae..3b5f2317980ff8b15abaab1a4c896778b6f4f2fd 100644 --- a/apps/maarch_entreprise/Views/basket-administration.component.html +++ b/apps/maarch_entreprise/Views/basket-administration.component.html @@ -68,13 +68,13 @@ <div class="col-md-6 col-xs-6 text-center"> <mat-form-field > <mat-select placeholder="{{lang.defaultSort}}" [(ngModel)]="orderColumnsSelected" (selectionChange)="onOrderChange()" [formControl]="columnsFormControl" name="basket_res_order" multiple> - <mat-option *ngFor="let column of orderColumns" [value]="column">{{lang[langVarName[orderColumns.indexOf(column)]]}}</mat-option> + <mat-option *ngFor="let column of orderColumns" [value]="column">{{langVarName[orderColumns.indexOf(column)]}}</mat-option> </mat-select> </mat-form-field> </div> <div class="col-md-6 col-xs-6 text-center"> <mat-chip *ngFor="let column of orderColumnsSelected" color="primary"> - <span class="badge badge-pill badge-dark">{{orderColumnsSelected.indexOf(column)+1}}</span> {{lang[langVarName[orderColumns.indexOf(column)]]}} + <span class="badge badge-pill badge-dark">{{orderColumnsSelected.indexOf(column)+1}}</span> {{langVarName[orderColumns.indexOf(column)]}} </mat-chip> </div> </div> diff --git a/apps/maarch_entreprise/documents_list_with_attachments.php b/apps/maarch_entreprise/documents_list_with_attachments.php index 2f37e71d018f43019c15e7594b1c405f89e4d6a0..462ad1f697a97dad30f95ec49c54647a7a8b7d44 100755 --- a/apps/maarch_entreprise/documents_list_with_attachments.php +++ b/apps/maarch_entreprise/documents_list_with_attachments.php @@ -96,8 +96,7 @@ array_push( 'contact_firstname', 'contact_lastname', 'contact_society', 'user_lastname', 'user_firstname', 'priority', 'creation_date', 'admission_date', 'subject', 'process_limit_date', 'entity_label', 'dest_user', 'category_id', 'type_label', - 'address_id', 'exp_user_id', 'doc_custom_n1 as count_attachment', 'alt_identifier', 'is_multicontacts', 'locker_user_id', 'locker_time', 'filename', - 'format' + 'address_id', 'exp_user_id', 'doc_custom_n1 as count_attachment', 'alt_identifier', 'is_multicontacts', 'locker_user_id', 'locker_time', 'filename' ); if ($core_tools->is_module_loaded('cases') == true) { diff --git a/apps/maarch_entreprise/js/angular/app/administration/basket-administration.component.ts b/apps/maarch_entreprise/js/angular/app/administration/basket-administration.component.ts index 993b0f3e22f24d08084e46f7a25cd5c4f2061423..c9bce0b9d88737020190a4ea0331bad20c216229 100644 --- a/apps/maarch_entreprise/js/angular/app/administration/basket-administration.component.ts +++ b/apps/maarch_entreprise/js/angular/app/administration/basket-administration.component.ts @@ -39,8 +39,8 @@ export class BasketAdministrationComponent implements OnInit { creationMode : boolean; displayedColumns = ['label_action', 'actions']; - orderColumns = ['alt_identifier','creation_date','format','priority','process_limit_date','res_id','subject','title','type_id']; - langVarName = ['chrono','creationDate','format','priority','processLimitDate','id','object','title','type'] + orderColumns = ['alt_identifier', 'creation_date', 'process_limit_date', 'res_id', 'priority']; + langVarName = [this.lang.chrono, this.lang.creationDate, this.lang.processLimitDate, this.lang.id, this.lang.priority]; orderColumnsSelected : string[] = []; selection : string[] = []; columnsFormControl : FormControl = new FormControl(); diff --git a/src/app/basket/models/BasketModelAbstract.php b/src/app/basket/models/BasketModelAbstract.php index a7a3b543d5af3e4bab16d0d9f96b027d5c42ed20..31e4b41be3d3d4db1039f8692678379762e8eeda 100644 --- a/src/app/basket/models/BasketModelAbstract.php +++ b/src/app/basket/models/BasketModelAbstract.php @@ -84,8 +84,8 @@ abstract class BasketModelAbstract public static function update(array $aArgs) { ValidatorModel::notEmpty($aArgs, ['id', 'basket_name', 'basket_desc', 'clause', 'isVisible', 'flagNotif']); - ValidatorModel::stringType($aArgs, ['id', 'basket_name', 'color', 'basket_desc', 'clause', 'isVisible', 'flagNotif']); - //ValidatorModel::arrayType($aArgs,['basket_res_order']); + ValidatorModel::stringType($aArgs, ['id', 'basket_name', 'color', 'basket_desc', 'clause', 'isVisible', 'flagNotif','basket_res_order']); + DatabaseModel::update([ 'table' => 'baskets', 'set' => [