diff --git a/package.json b/package.json index c3741b3..9b2a2b6 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,6 @@ "babel-core": "^6.25.0", "babel-eslint": "^7.2.3", "babel-loader": "^7.1.1", - "bootstrap-webpack": "^0.0.6", "css-loader": "^0.28.4", "eslint": "^4.3.0", "eslint-config-angular": "^0.5.0", @@ -57,12 +56,9 @@ "angular-messages": "^1.6.5", "angular-resource": "^1.6.5", "angular-strap": "^2.3.12", - "angular-ui-notification": "^0.3.6", - "angular2-notifications": "^0.7.4", "base64util": "^1.0.2", "bootbox": "^4.4.0", - "bootstrap": "^3.3.7", - "bootstrap-additions": "^0.3.1", + "bootstrap": "4.0.0-alpha.6", "c3": "^0.4.15", "font-awesome": "^4.7.0", "jquery": "^3.2.1", diff --git a/src/accounts/accountList.component.ts b/src/accounts/accountList.component.ts index 622fed5..7ffe65c 100644 --- a/src/accounts/accountList.component.ts +++ b/src/accounts/accountList.component.ts @@ -15,14 +15,14 @@ import { AccountEditModalComponent } from './accountEditModal.component'; selector: 'account-list', template: `
- +
- - - - + + + + diff --git a/src/app.module.ts b/src/app.module.ts index dc3f915..ea4f6bc 100644 --- a/src/app.module.ts +++ b/src/app.module.ts @@ -2,6 +2,8 @@ import 'zone.js'; import 'reflect-metadata'; +require('./main.less'); + import { AppModule as Ng1AppModule } from './app'; import { NgModule } from '@angular/core'; diff --git a/src/app.ts b/src/app.ts index 2e003e7..de46970 100644 --- a/src/app.ts +++ b/src/app.ts @@ -31,8 +31,6 @@ import loginModule from '@accountant/login'; import operationModule from '@accountant/operations'; import schedulerModule from '@accountant/scheduler'; -require('bootstrap-webpack!./bootstrap.config.ts'); - export const AppModule = angular.module('accountant', [ uiRouter, accountModule, diff --git a/src/index.ejs b/src/index.ejs index 534a0d5..2292ec3 100644 --- a/src/index.ejs +++ b/src/index.ejs @@ -29,13 +29,8 @@ -
Nom du compteSolde courantSolde pointéDécouvert autoriséActionsSolde courantSolde pointéDécouvert autoriséActions
- + - - - - + + + + @@ -50,7 +50,7 @@ - diff --git a/src/scheduler/scheduleList.component.ts b/src/scheduler/scheduleList.component.ts index 23dc281..244c594 100644 --- a/src/scheduler/scheduleList.component.ts +++ b/src/scheduler/scheduleList.component.ts @@ -15,17 +15,17 @@ var scheduleFormTmpl = require('./schedule.form.tmpl.html'); selector: 'schedule-list', template: `
-
Date d'op.Date d'op. Libellé de l'opérationMontantSoldeCatégorieActionsMontantSoldeCatégorieActions
+
- - - - + + + + - - - + + + diff --git a/src/scheduler/scheduleRow.component.ts b/src/scheduler/scheduleRow.component.ts index 24f7c39..02ce9c3 100644 --- a/src/scheduler/scheduleRow.component.ts +++ b/src/scheduler/scheduleRow.component.ts @@ -17,7 +17,7 @@ import { Schedule } from './schedule'; "[id]": "schedule.id", }, template: ` - + diff --git a/webpack.config.js b/webpack.config.js index c751891..f4861cd 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -44,7 +44,6 @@ module.exports = { enforce: 'pre', test: /\.jsx?$/, //include: path.resolve(__dirname, 'src'), - exclude: /(node_modules|bootstrap)/, loader: 'eslint-loader', options: { useEslintrc: false,
Date de débutDate de finJourFréq.Date de débutDate de finJourFréq. Libellé de l'opérationMontantCatégorieActionsMontantCatégorieActions
{{ schedule.start_date | date: "yyyy-MM-dd" }}{{ schedule.start_date | date: "yyyy-MM-dd" }} {{ schedule.stop_date | date: "yyyy-MM-dd" }}