inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-05-19 17:14:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Dev denys 1704 hotfix (#1717)

Browse Source 
* Update README.md

* #1173 fix doc documentlist

* Date widget: support for `display date format`

* unit tests update

* pin js-api version

* Fix Thumbnail preview (#1689)

* Fix Thumbnail preview

* Fix thumbnail unit test

* Remove the fix prexif

* Rollback the pin js api version

* Update package.json

* 1.2.1 tasklist,processlist,form
This commit is contained in:
Mario Romano 2017-03-10 18:46:22 +00:00 committed by GitHub
parent facd6e0458
commit cf85840350
12 changed files with 35 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
demo-shell-ng2/package.json
View File

@ -88,10 +88,10 @@
"ng2-alfresco-search": "1.2.0",
"ng2-alfresco-upload": "1.2.0",
"ng2-alfresco-viewer": "1.2.0",
"ng2-activiti-form": "1.2.0",
"ng2-activiti-tasklist": "1.2.0",
"ng2-activiti-form": "1.2.1",
"ng2-activiti-tasklist": "1.2.1",
"ng2-alfresco-userinfo": "1.2.0",
"ng2-activiti-processlist": "1.2.0",
"ng2-activiti-processlist": "1.2.1",
"ng2-alfresco-webscript": "1.2.0",
"ng2-alfresco-tag": "1.2.0",
"dialog-polyfill": "^0.4.3",

2
ng2-components/ng2-activiti-form/demo/package.json
View File

@ -58,7 +58,7 @@
"ng2-translate": "2.5.0",
"alfresco-js-api": "~1.2.0",
"ng2-alfresco-core": "1.2.0",
"ng2-activiti-form": "1.2.0"
"ng2-activiti-form": "1.2.1"
},
"devDependencies": {
"@types/jasmine": "^2.2.33",

2
ng2-components/ng2-activiti-form/package.json
View File

@ -1,7 +1,7 @@
{
"name": "ng2-activiti-form",
"description": "Alfresco Activiti Form Component for Angular 2",
"version": "1.2.0",
"version": "1.2.1",
"author": "Alfresco Software, Ltd.",
"scripts": {
"clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings",

6
ng2-components/ng2-activiti-form/src/components/widgets/core/form-field-validator.ts
View File

@ -145,7 +145,7 @@ export class DateFieldValidator implements FormFieldValidator {
validate(field: FormFieldModel): boolean {
if (this.isSupported(field) && field.value) {
if (DateFieldValidator.isValidDate(field.value)) {
if (DateFieldValidator.isValidDate(field.value, field.dateDisplayFormat)) {
return true;
}
field.validationSummary = 'Invalid date format';
@ -168,7 +168,7 @@ export class MinDateFieldValidator implements FormFieldValidator {
validate(field: FormFieldModel): boolean {
if (this.isSupported(field) && field.value) {
const dateFormat = 'D-M-YYYY';
const dateFormat = field.dateDisplayFormat;
if (!DateFieldValidator.isValidDate(field.value, dateFormat)) {
field.validationSummary = 'Invalid date format';
@ -201,7 +201,7 @@ export class MaxDateFieldValidator implements FormFieldValidator {
validate(field: FormFieldModel): boolean {
if (this.isSupported(field) && field.value) {
const dateFormat = 'D-M-YYYY';
const dateFormat = field.dateDisplayFormat;
if (!DateFieldValidator.isValidDate(field.value, dateFormat)) {
field.validationSummary = 'Invalid date format';

8
ng2-components/ng2-activiti-form/src/components/widgets/core/form-field.model.ts
View File

@ -44,6 +44,8 @@ export class FormFieldModel extends FormWidgetModel {
private _readOnly: boolean = false;
private _isValid: boolean = true;
readonly defaultDateFormat: string = 'D-M-YYYY';
// model members
fieldType: string;
id: string;
@ -74,6 +76,7 @@ export class FormFieldModel extends FormWidgetModel {
visibilityCondition: WidgetVisibilityModel = null;
enableFractions: boolean = false;
currency: string = null;
dateDisplayFormat: string = this.defaultDateFormat;
// container model members
numberOfColumns: number = 1;
@ -155,6 +158,7 @@ export class FormFieldModel extends FormWidgetModel {
this.visibilityCondition = <WidgetVisibilityModel> json.visibilityCondition;
this.enableFractions = <boolean>json.enableFractions;
this.currency = json.currency;
this.dateDisplayFormat = json.dateDisplayFormat || this.defaultDateFormat;
this._value = this.parseValue(json);
if (json.placeholder && json.placeholder !== '' && json.placeholder !== 'null') {
@ -247,7 +251,7 @@ export class FormFieldModel extends FormWidgetModel {
if (value) {
let d = moment(value.split('T')[0], 'YYYY-M-D');
if (d.isValid()) {
value = d.format('D-M-YYYY');
value = d.format(this.dateDisplayFormat);
}
}
}
@ -303,7 +307,7 @@ export class FormFieldModel extends FormWidgetModel {
}
break;
case FormFieldTypes.DATE:
let d = moment(this.value, 'D-M-YYYY');
let d = moment(this.value, this.dateDisplayFormat);
if (d.isValid()) {
this.form.values[this.id] = `${d.format('YYYY-MM-DD')}T00:00:00.000Z`;
} else {

2
ng2-components/ng2-activiti-form/src/components/widgets/date/date.widget.html
View File

@ -2,7 +2,7 @@
<div class="mdl-cell mdl-cell--11-col">
<div class="mdl-textfield mdl-js-textfield date-widget"
[class.date-widget__invalid]="!field.isValid">
<label [attr.for]="field.id">{{field.name}}</label>
<label [attr.for]="field.id">{{field.name}} ({{field.dateDisplayFormat}})</label>
<input class="mdl-textfield__input mdl-date__input"
type="text"
[attr.id]="field.id"

14
ng2-components/ng2-activiti-form/src/components/widgets/date/date.widget.spec.ts
View File

@ -54,7 +54,7 @@ describe('DateWidget', () => {
});
widget.ngOnInit();
let expected = moment(minValue, widget.DATE_FORMAT);
let expected = moment(minValue, widget.field.dateDisplayFormat);
expect(widget.datePicker._past.isSame(expected)).toBeTruthy();
});
@ -65,7 +65,7 @@ describe('DateWidget', () => {
});
widget.ngOnInit();
let expected = moment(maxValue, widget.DATE_FORMAT);
let expected = moment(maxValue, widget.field.dateDisplayFormat);
expect(widget.datePicker._future.isSame(expected)).toBeTruthy();
});
@ -77,7 +77,7 @@ describe('DateWidget', () => {
});
widget.ngOnInit();
let expected = moment(dateValue, widget.DATE_FORMAT);
let expected = moment(dateValue, widget.field.dateDisplayFormat);
expect(widget.datePicker.time.isSame(expected)).toBeTruthy();
});
@ -115,7 +115,7 @@ describe('DateWidget', () => {
widget.field.value = '31-03-1982';
widget.onDateChanged();
let expected = moment('31-03-1982', widget.DATE_FORMAT);
let expected = moment('31-03-1982', widget.field.dateDisplayFormat);
expect(widget.datePicker.time.isSame(expected)).toBeTruthy();
});
@ -124,7 +124,7 @@ describe('DateWidget', () => {
widget.ngOnInit();
let date = '13-3-1982';
widget.datePicker.time = moment(date, widget.DATE_FORMAT);
widget.datePicker.time = moment(date, widget.field.dateDisplayFormat);
widget.onDateSelected();
expect(widget.field.value).toBe(date);
});
@ -157,7 +157,7 @@ describe('DateWidget', () => {
spyOn(w, 'setupMaterialTextField').and.callThrough();
w.field = new FormFieldModel(null, {value: '9-9-9999', type: 'date'});
w.ngOnInit();
w.datePicker.time = moment('9-9-9999', w.DATE_FORMAT);
w.datePicker.time = moment('9-9-9999', w.field.dateDisplayFormat);
w.fieldChanged.subscribe((field) => {
expect(field).toBeDefined();
expect(field).not.toBeNull();
@ -172,7 +172,7 @@ describe('DateWidget', () => {
spyOn(w, 'setupMaterialTextField').and.callThrough();
w.field = new FormFieldModel(null, {value: '9-9-9999', type: 'date'});
w.ngOnInit();
w.datePicker.time = moment('9-9-9999', w.DATE_FORMAT);
w.datePicker.time = moment('9-9-9999', w.field.dateDisplayFormat);
w.fieldChanged.subscribe((field) => {
expect(field).toBeDefined();
expect(field).not.toBeNull();

12
ng2-components/ng2-activiti-form/src/components/widgets/date/date.widget.ts
View File

@ -30,8 +30,6 @@ declare var componentHandler: any;
})
export class DateWidget extends WidgetComponent implements OnInit, AfterViewChecked {
DATE_FORMAT: string = 'D-M-YYYY';
datePicker: any;
constructor(private elementRef: ElementRef) {
@ -49,15 +47,15 @@ export class DateWidget extends WidgetComponent implements OnInit, AfterViewChec
if (this.field) {
if (this.field.minValue) {
settings.past = moment(this.field.minValue, this.DATE_FORMAT);
settings.past = moment(this.field.minValue, this.field.dateDisplayFormat);
}
if (this.field.maxValue) {
settings.future = moment(this.field.maxValue, this.DATE_FORMAT);
settings.future = moment(this.field.maxValue, this.field.dateDisplayFormat);
}
if (this.field.value) {
settings.init = moment(this.field.value, this.DATE_FORMAT);
settings.init = moment(this.field.value, this.field.dateDisplayFormat);
}
}
@ -73,7 +71,7 @@ export class DateWidget extends WidgetComponent implements OnInit, AfterViewChec
onDateChanged() {
if (this.field.value) {
let value = moment(this.field.value, this.DATE_FORMAT);
let value = moment(this.field.value, this.field.dateDisplayFormat);
if (!value.isValid()) {
value = moment();
}
@ -83,7 +81,7 @@ export class DateWidget extends WidgetComponent implements OnInit, AfterViewChec
}
onDateSelected() {
let newValue = this.datePicker.time.format(this.DATE_FORMAT);
let newValue = this.datePicker.time.format(this.field.dateDisplayFormat);
this.field.value = newValue;
this.checkVisibility(this.field);

4
ng2-components/ng2-activiti-processlist/demo/package.json
View File

@ -50,10 +50,10 @@
"md-date-time-picker": "^2.2.0",
"ng2-translate": "2.5.0",
"alfresco-js-api": "~1.2.0",
"ng2-activiti-tasklist": "1.2.0",
"ng2-activiti-tasklist": "1.2.1",
"ng2-alfresco-core": "1.2.0",
"ng2-alfresco-datatable": "1.2.0",
"ng2-activiti-processlist": "1.2.0"
"ng2-activiti-processlist": "1.2.1"
},
"devDependencies": {
"@types/jasmine": "^2.2.33",

6
ng2-components/ng2-activiti-processlist/package.json
View File

@ -1,7 +1,7 @@
{
"name": "ng2-activiti-processlist",
"description": "Show active processes from the Activiti Process Services suite",
"version": "1.2.0",
"version": "1.2.1",
"author": "Alfresco Software, Ltd.",
"scripts": {
"clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings",
@ -63,8 +63,8 @@
"md-date-time-picker": "^2.2.0",
"ng2-translate": "2.5.0",
"alfresco-js-api": "~1.2.0",
"ng2-activiti-form": "1.2.0",
"ng2-activiti-tasklist": "1.2.0",
"ng2-activiti-form": "1.2.1",
"ng2-activiti-tasklist": "1.2.1",
"ng2-alfresco-core": "1.2.0",
"ng2-alfresco-datatable": "1.2.0"
},

2
ng2-components/ng2-activiti-tasklist/demo/package.json
View File

@ -46,7 +46,7 @@
"alfresco-js-api": "~1.2.0",
"ng2-alfresco-core": "1.2.0",
"ng2-alfresco-datatable": "1.2.0",
"ng2-activiti-tasklist": "1.2.0"
"ng2-activiti-tasklist": "1.2.1"
},
"devDependencies": {
"@types/jasmine": "^2.2.33",

4
ng2-components/ng2-activiti-tasklist/package.json
View File

@ -1,7 +1,7 @@
{
"name": "ng2-activiti-tasklist",
"description": "Activiti Angular2 Task List Component",
"version": "1.2.0",
"version": "1.2.1",
"author": "Alfresco Software, Ltd.",
"scripts": {
"clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings",
@ -68,7 +68,7 @@
"md-date-time-picker": "^2.2.0",
"ng2-translate": "2.5.0",
"alfresco-js-api": "~1.2.0",
"ng2-activiti-form": "1.2.0",
"ng2-activiti-form": "1.2.1",
"ng2-alfresco-core": "1.2.0",
"ng2-alfresco-datatable": "1.2.0"
},