diff --git a/projects/truly-ui/src/components/editor/interfaces/toolbar-config.ts b/projects/truly-ui/src/components/editor/interfaces/toolbar-config.ts
index e8864bb27..8c8a413fa 100644
--- a/projects/truly-ui/src/components/editor/interfaces/toolbar-config.ts
+++ b/projects/truly-ui/src/components/editor/interfaces/toolbar-config.ts
@@ -3,7 +3,7 @@
/*
MIT License
- Copyright (c) 2017 Temainfo Sistemas
+ Copyright (c) 2019 Temainfo Sistemas
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/projects/truly-ui/src/components/editor/model/toolbar-config.model.ts b/projects/truly-ui/src/components/editor/model/toolbar-config.model.ts
index 672095cbd..791ec69bc 100644
--- a/projects/truly-ui/src/components/editor/model/toolbar-config.model.ts
+++ b/projects/truly-ui/src/components/editor/model/toolbar-config.model.ts
@@ -1,7 +1,7 @@
/*
MIT License
- Copyright (c) 2017 Temainfo Sistemas
+ Copyright (c) 2019 Temainfo Sistemas
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/projects/truly-ui/src/components/form/form-submit.directive.ts b/projects/truly-ui/src/components/form/form-submit.directive.ts
index 83f20435b..c5b44c34e 100644
--- a/projects/truly-ui/src/components/form/form-submit.directive.ts
+++ b/projects/truly-ui/src/components/form/form-submit.directive.ts
@@ -3,7 +3,7 @@
/*
MIT License
- Copyright (c) 2017 Temainfo Sistemas
+ Copyright (c) 2019 Temainfo Sistemas
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/projects/truly-ui/src/components/form/form.html b/projects/truly-ui/src/components/form/form.html
index 7e46e1a27..a21b54f2e 100644
--- a/projects/truly-ui/src/components/form/form.html
+++ b/projects/truly-ui/src/components/form/form.html
@@ -1,4 +1,9 @@
+
diff --git a/projects/truly-ui/src/components/overlaylist/overlay-list.scss b/projects/truly-ui/src/components/overlaylist/overlay-list.scss
index f84d0d945..04784ffbc 100644
--- a/projects/truly-ui/src/components/overlaylist/overlay-list.scss
+++ b/projects/truly-ui/src/components/overlaylist/overlay-list.scss
@@ -106,6 +106,14 @@ $default-outline: none;
}
}
+.group-list {
+ .group-description {
+ font-weight: 600;
+ color: #ababab;
+ padding: 0 5px;
+ }
+}
+
.default-option {
padding: 0 5px;
> i {
diff --git a/projects/truly-ui/src/components/overlaylist/overlay-list.ts b/projects/truly-ui/src/components/overlaylist/overlay-list.ts
index d243a6e25..9af7f1fbd 100644
--- a/projects/truly-ui/src/components/overlaylist/overlay-list.ts
+++ b/projects/truly-ui/src/components/overlaylist/overlay-list.ts
@@ -21,24 +21,33 @@
*/
import {
Component, EventEmitter, OnInit, Output, Input, ViewChild, ElementRef, ViewChildren, QueryList,
- AfterViewInit, SimpleChanges, OnChanges, Renderer2,
+ AfterViewInit, SimpleChanges, OnChanges, Renderer2, OnDestroy,
} from '@angular/core';
import { ActiveDescendantKeyManager, FocusKeyManager } from '@angular/cdk/a11y';
-import { KeyEvent } from '../core/enums/key-events';
import { TlListItem } from './list-item/list-item';
import { TlInput } from '../input/input';
import { I18nService } from '../i18n/i18n.service';
import { ListItemInterface } from '../dropdownlist/interfaces/list-item';
import { scrollIntoView } from '../core/helper/scrollIntoView';
+import * as path from 'object-path';
+import { Subscription } from 'rxjs';
@Component( {
selector: 'tl-overlay-list',
templateUrl: './overlay-list.html',
styleUrls: [ './overlay-list.scss' ],
} )
-export class TlOverlayList implements OnInit, AfterViewInit, OnChanges {
+export class TlOverlayList implements OnInit, AfterViewInit, OnChanges, OnDestroy {
- @Input( 'datasource' ) datasource = [];
+ @Input( 'datasource' )
+ set dataSource(data) {
+ this._datasource = data;
+ this.getFilteredData();
+ }
+
+ get dataSource() {
+ return this._datasource;
+ }
@Input( 'searchOnList' ) searchOnList = false;
@@ -52,7 +61,9 @@ export class TlOverlayList implements OnInit, AfterViewInit, OnChanges {
@Input( 'keyText' ) keyText = 'text';
- @Input() keyIcon = 'icon';
+ @Input( 'groupBy' ) groupBy = null;
+
+ @Input( 'keyIcon' ) keyIcon = 'icon';
@Input( 'icon' ) icon = null;
@@ -90,11 +101,24 @@ export class TlOverlayList implements OnInit, AfterViewInit, OnChanges {
public notFound = false;
+ public groups = [];
+
+ public unGrouped = [];
+
+ public objectPath = path;
+
+ private _datasource = [];
+
+ private numberItems = 0;
+
+ private subscription = new Subscription();
+
get emptyList() {
return this.i18n.getLocale().OverlayList.emptyList;
}
- constructor( private renderer: Renderer2, private i18n: I18nService ) {}
+ constructor( private renderer: Renderer2,
+ private i18n: I18nService ) {}
ngOnInit() {
}
@@ -105,22 +129,69 @@ export class TlOverlayList implements OnInit, AfterViewInit, OnChanges {
this.keyManager.withWrap();
this.handleActiveItem();
this.handleModelOption();
+ this.getFilteredData();
+ }
+
+ getFilteredData() {
+ this.groups = [];
+ this.unGrouped = [];
+ if (!this.groupBy) {
+ this.unGrouped = this.dataSource;
+ return;
+ }
+ this.dataSource.forEach( ( value ) => {
+ if (!this.objectPath.get(value, this.groupBy)) {
+ this.unGrouped = this.getItemsGroup(this.objectPath.get(value, this.groupBy));
+ return;
+ }
+ if ( !this.existGroup( this.objectPath.get(value, this.groupBy) ) ) {
+ this.groups.push( {
+ description: this.objectPath.get(value, this.groupBy),
+ items: this.getItemsGroup( this.objectPath.get(value, this.groupBy) )
+ } );
+ }
+ } );
+ }
+
+ existGroup( group ) {
+ for ( const item of this.groups ) {
+ if ( item.description === group ) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ getItemsGroup( group ) {
+ const filter = this.dataSource.filter( ( item ) => this.objectPath.get(item, this.groupBy) === group);
+ this.numberItems += filter.length;
+ return filter;
}
handleCustomInputEvents() {
if (this.customInput) {
this.handleInputFocus();
- this.renderer.listen( this.customInput, 'keydown', ($event) => {
- if (this.isKeyCodeEnter($event) && this.hasDataOnDataSource()) {
+
+ this.subscription.add(this.renderer.listen( this.customInput, 'keydown.enter', () => {
+ if (this.hasDataOnDataSource()) {
this.emitSelectOption();
}
- this.handleKeyEvents($event);
- });
+ }));
+
+ this.subscription.add(this.renderer.listen( this.customInput, 'keydown.arrowdown', () => {
+ this.keyManager.setNextItemActive();
+ this.handleScrollIntoView();
+ }));
+
+ this.subscription.add(this.renderer.listen( this.customInput, 'keydown.arrowup', () => {
+ this.keyManager.setPreviousItemActive();
+ this.handleScrollIntoView();
+ }));
}
}
handleInputFocus() {
- if (this.searchOnList) {
+ if (this.searchOnList && !this.customFocus) {
setTimeout(() => {
this.tlInput.setFocus();
}, 1);
@@ -128,11 +199,7 @@ export class TlOverlayList implements OnInit, AfterViewInit, OnChanges {
}
hasDataOnDataSource() {
- return this.datasource.length > 0;
- }
-
- isKeyCodeEnter($event) {
- return $event.keyCode === KeyEvent.ENTER;
+ return this.dataSource.length > 0;
}
handleActiveItem() {
@@ -153,18 +220,12 @@ export class TlOverlayList implements OnInit, AfterViewInit, OnChanges {
setActiveItem(index: number) {
this.removeSelectedAll();
this.keyManager.setActiveItem(index);
- this.handleScrollIntoView();
}
removeSelectedAll() {
this.items.forEach((item) => item.selected = false);
}
- handleKeyEvents( $event: KeyboardEvent ) {
- this.keyManager.onKeydown( $event );
- this.handleScrollIntoView();
- }
-
handleScrollIntoView() {
if (this.keyManager.activeItem) {
scrollIntoView(this.keyManager.activeItem.element.nativeElement);
@@ -187,9 +248,9 @@ export class TlOverlayList implements OnInit, AfterViewInit, OnChanges {
this.findByLetter.emit($event.key);
}
- handleClickOption( index: number, $event ) {
+ handleClickOption( $event, item: TlListItem ) {
this.stopEvent($event);
- this.keyManager.setActiveItem( index );
+ this.keyManager.setActiveItem( item );
this.emitSelectOption();
}
@@ -211,10 +272,11 @@ export class TlOverlayList implements OnInit, AfterViewInit, OnChanges {
keydownSearch( $event ) {
this.search.emit( $event.target.value );
+ this.unGrouped = [];
}
setNotFound() {
- this.notFound = this.datasource.length === 0;
+ this.notFound = this.dataSource.length === 0;
}
ngOnChanges(changes: SimpleChanges ) {
@@ -227,5 +289,10 @@ export class TlOverlayList implements OnInit, AfterViewInit, OnChanges {
this.handleModelOption();
}
}
+
+ ngOnDestroy() {
+ this.subscription.unsubscribe();
+ }
+
}
diff --git a/projects/truly-ui/src/components/panelgroup/panelgroup.ts b/projects/truly-ui/src/components/panelgroup/panelgroup.ts
index 338ae714e..7db43dc08 100644
--- a/projects/truly-ui/src/components/panelgroup/panelgroup.ts
+++ b/projects/truly-ui/src/components/panelgroup/panelgroup.ts
@@ -41,7 +41,7 @@ export class TlPanelGroup implements AfterViewInit {
@Input() customTemplate: TemplateRef
;
- @Input() fontSizeCaption = '1em';
+ @Input() fontSizeCaption = '12px';
@Input() showButtonAction = false;
diff --git a/projects/truly-ui/src/components/permissions/parts/directives/permission-group.directive.ts b/projects/truly-ui/src/components/permissions/parts/directives/permission-group.directive.ts
index 750bfab30..dc846ce0d 100644
--- a/projects/truly-ui/src/components/permissions/parts/directives/permission-group.directive.ts
+++ b/projects/truly-ui/src/components/permissions/parts/directives/permission-group.directive.ts
@@ -1,7 +1,7 @@
/*
MIT License
- Copyright (c) 2017 Temainfo Sistemas
+ Copyright (c) 2019 Temainfo Sistemas
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/projects/truly-ui/src/components/permissions/parts/interfaces/permission-dataconfig.interface.ts b/projects/truly-ui/src/components/permissions/parts/interfaces/permission-dataconfig.interface.ts
index 068fdf8ca..023096191 100644
--- a/projects/truly-ui/src/components/permissions/parts/interfaces/permission-dataconfig.interface.ts
+++ b/projects/truly-ui/src/components/permissions/parts/interfaces/permission-dataconfig.interface.ts
@@ -3,7 +3,7 @@
/*
MIT License
- Copyright (c) 2017 Temainfo Sistemas
+ Copyright (c) 2019 Temainfo Sistemas
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/projects/truly-ui/src/components/permissions/parts/models/permission.model.ts b/projects/truly-ui/src/components/permissions/parts/models/permission.model.ts
index fa0c8cba9..6d9f12482 100644
--- a/projects/truly-ui/src/components/permissions/parts/models/permission.model.ts
+++ b/projects/truly-ui/src/components/permissions/parts/models/permission.model.ts
@@ -3,7 +3,7 @@
/*
MIT License
- Copyright (c) 2017 Temainfo Sistemas
+ Copyright (c) 2019 Temainfo Sistemas
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/projects/truly-ui/src/components/popupmenu/parts/popupmenu-item.ts b/projects/truly-ui/src/components/popupmenu/parts/popupmenu-item.ts
index 7e25f059b..e1ac6a2ec 100644
--- a/projects/truly-ui/src/components/popupmenu/parts/popupmenu-item.ts
+++ b/projects/truly-ui/src/components/popupmenu/parts/popupmenu-item.ts
@@ -1,7 +1,7 @@
/*
MIT License
- Copyright (c) 2017 Temainfo Sistemas
+ Copyright (c) 2019 Temainfo Sistemas
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/projects/truly-ui/src/components/popupmenu/popupmenu.ts b/projects/truly-ui/src/components/popupmenu/popupmenu.ts
index 69db1caa5..8b9c9131e 100644
--- a/projects/truly-ui/src/components/popupmenu/popupmenu.ts
+++ b/projects/truly-ui/src/components/popupmenu/popupmenu.ts
@@ -1,7 +1,7 @@
/*
MIT License
- Copyright (c) 2017 Temainfo Sistemas
+ Copyright (c) 2019 Temainfo Sistemas
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/projects/truly-ui/src/components/progressbar/progressbar.html b/projects/truly-ui/src/components/progressbar/progressbar.html
index 646d0a968..26e50554e 100644
--- a/projects/truly-ui/src/components/progressbar/progressbar.html
+++ b/projects/truly-ui/src/components/progressbar/progressbar.html
@@ -1,5 +1,5 @@
-
+
{{getProgressDescription()}} %
({{position}} {{unit}} / {{max}} {{unit}})
diff --git a/projects/truly-ui/src/components/progressbar/progressbar.scss b/projects/truly-ui/src/components/progressbar/progressbar.scss
index 133e8f17f..db7ece58f 100644
--- a/projects/truly-ui/src/components/progressbar/progressbar.scss
+++ b/projects/truly-ui/src/components/progressbar/progressbar.scss
@@ -5,6 +5,10 @@
box-sizing: border-box;
}
+.border-rounded {
+ border-radius: 10px;
+}
+
.ui-progressbar {
width: 100%;
}
diff --git a/projects/truly-ui/src/components/progressbar/progressbar.ts b/projects/truly-ui/src/components/progressbar/progressbar.ts
index 9c8458603..00c17f027 100644
--- a/projects/truly-ui/src/components/progressbar/progressbar.ts
+++ b/projects/truly-ui/src/components/progressbar/progressbar.ts
@@ -40,6 +40,8 @@ export class TlProgressBar implements OnInit, OnChanges {
@Input() height = '15px';
+ @Input() shape: 'default' | 'rounded' = 'rounded';
+
@Input() progressInfo: 'none' | 'percentage' | 'detailed' = 'percentage';
@Input() mode: 'determinate' | 'indeterminate' = 'determinate';
diff --git a/projects/truly-ui/src/components/schedule/i18n/schedule-i18n.ts b/projects/truly-ui/src/components/schedule/i18n/schedule-i18n.ts
new file mode 100644
index 000000000..4cc505037
--- /dev/null
+++ b/projects/truly-ui/src/components/schedule/i18n/schedule-i18n.ts
@@ -0,0 +1,37 @@
+/*
+ *
+ * MIT License
+ *
+ * Copyright (c) 2019 Temainfo Sistemas
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ * /
+ */
+export const ScheduleI18n = {
+ views: {
+ day: 'Day',
+ week: 'Week',
+ month: 'Month',
+ workWeek: 'Work Week',
+ dayList: 'Day List',
+ weekList: 'Week List',
+ },
+ buttons: {
+ addEvent: 'Add Event'
+ },
+ scaleNotFound: 'Scale Not Exists'
+};
diff --git a/projects/truly-ui/src/components/schedule/index.ts b/projects/truly-ui/src/components/schedule/index.ts
index 2ff0670ed..f709cc582 100644
--- a/projects/truly-ui/src/components/schedule/index.ts
+++ b/projects/truly-ui/src/components/schedule/index.ts
@@ -14,6 +14,8 @@ import { BlockUIModule } from '../blockui/index';
import { ButtonModule } from '../button/index';
import { ButtonGroupModule } from '../buttongroup/index';
import { GenerateEventsService } from './services/generate-events.service';
+import { WorkScaleService } from './services/work-scale.service';
+import { EventService } from './services/event.service';
@NgModule({
@@ -36,7 +38,9 @@ import { GenerateEventsService } from './services/generate-events.service';
TlSchedule,
],
providers: [
- GenerateEventsService
+ GenerateEventsService,
+ WorkScaleService,
+ EventService
]
})
export class ScheduleModule {}
diff --git a/projects/truly-ui/src/components/schedule/parts/heading/heading.component.html b/projects/truly-ui/src/components/schedule/parts/heading/heading.component.html
index df909178c..0ed341d07 100644
--- a/projects/truly-ui/src/components/schedule/parts/heading/heading.component.html
+++ b/projects/truly-ui/src/components/schedule/parts/heading/heading.component.html
@@ -4,7 +4,7 @@
@@ -22,6 +22,6 @@
-
+
diff --git a/projects/truly-ui/src/components/schedule/parts/heading/heading.component.ts b/projects/truly-ui/src/components/schedule/parts/heading/heading.component.ts
index 788c206c2..deaf861f9 100644
--- a/projects/truly-ui/src/components/schedule/parts/heading/heading.component.ts
+++ b/projects/truly-ui/src/components/schedule/parts/heading/heading.component.ts
@@ -1,5 +1,6 @@
import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
import { ViewType } from '../../types/view.type';
+import { ScheduleI18n } from '../../i18n/schedule-i18n';
@Component({
selector: 'tl-schedule-heading',
@@ -14,6 +15,8 @@ export class HeadingComponent implements OnInit {
@Input() currentDate = new Date();
+ @Input() texts = ScheduleI18n;
+
@Output() changeView = new EventEmitter
();
@Output() changeDate = new EventEmitter();
diff --git a/projects/truly-ui/src/components/schedule/schedule.html b/projects/truly-ui/src/components/schedule/schedule.html
index c01338c71..07247fac8 100644
--- a/projects/truly-ui/src/components/schedule/schedule.html
+++ b/projects/truly-ui/src/components/schedule/schedule.html
@@ -3,6 +3,7 @@
+
+