Skip to content

Commit fef0f31

Browse files
author
Leonid
committed
Merge remote-tracking branch 'origin/master'
2 parents 90c2d94 + 2ba5e6c commit fef0f31

File tree

14 files changed

+684
-704
lines changed

14 files changed

+684
-704
lines changed

eform-client/angular.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"assets": [
2626
{ "glob": "**/*", "input": "src/assets/", "output": "/assets/" },
2727
{ "glob": "**/assets/**", "input": "src/app/plugins/modules", "output": "/assets/" },
28-
{ "glob": "favicon.ico", "input": "/src", "output": "/" }
28+
{ "glob": "favicon.ico", "input": "src/", "output": "/" }
2929
],
3030
"styles": [
3131
"port/angular-bootstrap-md/scss/bootstrap/bootstrap.scss",

eform-client/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
"date-fns": "^1.29.0",
3737
"glob": "^7.1.3",
3838
"hammerjs": "^2.0.8",
39+
"ng-pick-datetime": "^6.0.16",
3940
"ng2-dragula": "^2.0.2",
4041
"ng2-file-upload": "^1.3.0",
4142
"ngx-slimscroll": "^5.2.2",

eform-client/src/app/common/models/cases/request/cases-request.model.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export class CasesRequestModel {
1111
this.sort = 'id';
1212
this.nameFilter = '';
1313
this.isSortDsc = true;
14-
this.pageSize = 10;
14+
this.pageSize = 1000;
1515
this.pageIndex = 0;
1616
this.offset = 0;
1717
}

eform-client/src/app/common/modules/eform-imported/eform-imported.module.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
11
import {NgModule} from '@angular/core';
22
import {CommonModule} from '@angular/common';
33
import {PellModule} from 'src/app/common/modules/eform-imported/pell/pell.module';
4-
import {NgDatepickerModule} from './ng-datepicker/module/ng-datepicker.module';
54

65
@NgModule({
76
imports: [
87
CommonModule,
9-
NgDatepickerModule,
10-
PellModule,
8+
PellModule
119
],
1210
declarations: [
1311
],
1412
exports: [
15-
NgDatepickerModule,
1613
PellModule
1714
]
1815
})

eform-client/src/app/common/modules/eform-imported/ng-datepicker/component/ng-datepicker.component.html

Lines changed: 0 additions & 78 deletions
This file was deleted.

eform-client/src/app/common/modules/eform-imported/ng-datepicker/component/ng-datepicker.component.sass

Lines changed: 0 additions & 129 deletions
This file was deleted.

0 commit comments

Comments
 (0)