Commit 22f700f2 authored by Alex ORLUC's avatar Alex ORLUC

FEAT #8803 upgrade to angular 7

parent 34c258d4
......@@ -2,6 +2,7 @@
"name": "MaarchCourrier",
"description": "MaarchCourrier",
"scripts": {
"update": "ng update",
"build": "ng build",
"build-watch": "ng build --watch",
"build-prod": "ng build --prod && npm run build-css",
......@@ -15,7 +16,7 @@
"bootstrap": "^3.3.7",
"chart.js": "1.1.1",
"chosen-js": "^1.8.7",
"core-js": "^2.5.7",
"core-js": "^2.6.1",
"jquery": "^3.3.1",
"jquery-typeahead": "^2.10.6",
"jquery.nicescroll": "~3.6.8",
......@@ -26,35 +27,39 @@
"tinymce": "^4.8.5",
"tooltipster": "^4.2.6",
"uglify-es": "3.2.2",
"uglifyjs-webpack-plugin": "1.1.5",
"uglifyjs-webpack-plugin": "2.1.1",
"zone.js": "^0.8.26"
},
"devDependencies": {
"@angular-devkit/build-angular": "^0.6.8",
"@angular/animations": "^6.1.10",
"@angular/cdk": "^6.4.7",
"@angular/cli": "^6.2.6",
"@angular/common": "^6.1.10",
"@angular/compiler": "^6.1.10",
"@angular/compiler-cli": "^6.1.10",
"@angular/core": "^6.1.10",
"@angular/forms": "^6.1.10",
"@angular/http": "^6.1.10",
"@angular/material": "^6.4.7",
"@angular/platform-browser": "^6.1.10",
"@angular/platform-browser-dynamic": "^6.1.10",
"@angular/platform-server": "^6.1.10",
"@angular/router": "^6.1.10",
"@angular-devkit/build-angular": "~0.12.0",
"@angular/animations": "^7.2.0",
"@angular/cdk": "^7.2.1",
"@angular/cli": "^7.2.0",
"@angular/common": "^7.2.0",
"@angular/compiler": "^7.2.0",
"@angular/compiler-cli": "^7.2.0",
"@angular/core": "^7.2.0",
"@angular/forms": "^7.2.0",
"@angular/http": "^7.2.0",
"@angular/material": "^7.2.1",
"@angular/platform-browser": "^7.2.0",
"@angular/platform-browser-dynamic": "^7.2.0",
"@angular/platform-server": "^7.2.0",
"@angular/router": "^7.2.0",
"@types/datatables.net": "^1.10.13",
"@types/jquery": "^2.0.51",
"@types/node": "^7.10.1",
"ajv": "^6.6.2",
"hammerjs": "^2.0.8",
"html-minifier": "^3.5.21",
"ng2-dnd": "^5.0.2",
"node-sass": "^4.9.4",
"nodemon": "^1.18.5",
"rxjs": "^6.3.3",
"tslib": "^1.9.3",
"typescript": "^2.9.2"
"tslib": "^1.9.0",
"typescript": "^3.2.2",
"url-loader": "^1.1.2",
"webpack": "^4.28.3"
},
"repository": {}
}
.mat-chip {
padding: 25px !important;
}
\ No newline at end of file
......@@ -15,6 +15,7 @@ declare var angularGlobals: any;
@Component({
templateUrl: "basket-administration.component.html",
styleUrls: ['basket-administration.component.scss'],
providers: [NotificationService]
})
export class BasketAdministrationComponent implements OnInit {
......
......@@ -86,6 +86,7 @@ mat-toolbar {
.actions {
box-shadow: none;
border: none;
flex: 1;
justify-content: flex-end;
overflow: inherit;
......
<mat-button-toggle-group #group="matButtonToggleGroup" class="envFilter" multiple>
<mat-checkbox color="primary" style="margin: 10px;" title="Sélectionner tous les courriers de la bannette"></mat-checkbox>
<form [formGroup]="stateForm" [style.flex]="1">
<mat-form-field appearance="outline" floatLabel="never" [style.fontSize.px]="10">
<mat-form-field appearance="outline" floatLabel="never" [style.fontSize.px]="10" style="top: -2px;">
<input class="metaSearch" type="text" matInput placeholder="{{lang.searchMailInBasket}}" formControlName="stateGroup"
[matAutocomplete]="autoGroup" (focus)="initFilters()" (keyup.enter)="metaSearch($event);">
<mat-autocomplete #autoGroup="matAutocomplete" (optionSelected)="selectFilter($event)" panelWidth="400">
......@@ -23,11 +23,11 @@
</mat-autocomplete>
</mat-form-field>
</form>
<mat-button-toggle [checked]="this.listProperties.delayed" value="delayed" title="{{lang.displayProcessLimitRes}}"
<mat-button-toggle class="processLimitButton" [checked]="this.listProperties.delayed" value="delayed" title="{{lang.displayProcessLimitRes}}"
(change)="setFilters($event, 'delayed')">
<mat-icon fontSet="fas" fontIcon="fa-stopwatch fa-2x"></mat-icon>
</mat-button-toggle>
<mat-form-field appearance="outline" [style.fontSize.px]="10" style="flex: 1;">
<mat-form-field appearance="outline" [style.fontSize.px]="10" style="flex: 1;top: -2px;">
<mat-label>{{lang.orderBy}}</mat-label>
<mat-select [(ngModel)]="this.listProperties.order" (selectionChange)="updateFilters()">
<mat-option value="" style="text-align: center;">{{lang.defaultOrder}}</mat-option>
......
......@@ -6,8 +6,15 @@
height: auto;
}
.processLimitButton {
color: #666;
.mat-button-toggle-label-content {
line-height: 38px;
}
}
.mat-button-toggle-checked {
background-color: #F99830;
background-color: #F99830 !important;
color: white;
border-radius: 10px;
}
......
......@@ -37,7 +37,7 @@
<mat-icon class="fa {{shortcut.style}}" style="height:auto;font-size:22px;"></mat-icon>
</button>
</span>
<span style="flex:1;text-align: left;padding: 5px;" *ngIf="shortcut.id=='index_mlb' && shortcut.shortcut == 'true' && speedDialFabButtons.length>1">
<span style="flex:1;text-align: left;padding: 5px;position: relative;" *ngIf="shortcut.id=='index_mlb' && shortcut.shortcut == 'true' && speedDialFabButtons.length>1">
<smd-fab-speed-dial #myFab direction="down" animationMode="fling" fixed="false" (mouseenter)="myFab.open = true"
(mouseleave)="myFab.open = false">
<smd-fab-trigger spin="true">
......
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment