diff --git a/package-lock.json b/package-lock.json index 0c080a9..bf2b11b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5769,12 +5769,11 @@ } }, "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "dev": true, + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" @@ -7359,10 +7358,9 @@ } }, "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "dev": true, + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dependencies": { "to-regex-range": "^5.0.1" }, diff --git a/src/app/delegate-types-form/delegate-types-form.component.html b/src/app/delegate-types-form/delegate-types-form.component.html index 69cf82e..487af9e 100644 --- a/src/app/delegate-types-form/delegate-types-form.component.html +++ b/src/app/delegate-types-form/delegate-types-form.component.html @@ -26,11 +26,22 @@
- +
+
+ +
+
+ +
+
diff --git a/src/app/delegate-types-form/delegate-types-form.component.ts b/src/app/delegate-types-form/delegate-types-form.component.ts index d708193..5b7a572 100644 --- a/src/app/delegate-types-form/delegate-types-form.component.ts +++ b/src/app/delegate-types-form/delegate-types-form.component.ts @@ -18,6 +18,7 @@ export class DelegateTypesFormComponent extends WsComponent implements OnInit { @Input() delType: DelegateType; @Input() selectedEvent: Event; @ViewChild('form') form: NgForm; + color = '#4A0D66'; zones: Zone[]; constructor(private zoneService: ZoneService) { @@ -25,6 +26,9 @@ export class DelegateTypesFormComponent extends WsComponent implements OnInit { } ngOnInit(): void { + if (this.delType.color) { + this.color = this.delType.color; + } this.subscribe( this.zoneService.getList(this.selectedEvent.id).subscribe(res => { this.zones = res.zones; diff --git a/src/app/people-filter/people-filter.component.html b/src/app/people-filter/people-filter.component.html index 7972c6e..be623df 100644 --- a/src/app/people-filter/people-filter.component.html +++ b/src/app/people-filter/people-filter.component.html @@ -55,11 +55,12 @@
{{'filter' | translate}}
+ > +
diff --git a/src/app/people-filter/people-filter.component.ts b/src/app/people-filter/people-filter.component.ts index cbf3127..67d25f6 100644 --- a/src/app/people-filter/people-filter.component.ts +++ b/src/app/people-filter/people-filter.component.ts @@ -62,7 +62,11 @@ export class PeopleFilterComponent extends WsComponent implements OnInit { this.delegateTypes = res.delegate_types; }), this.skillService.getSkills(this.selectedEvent.id).subscribe(res => { - this.skills = res.skills.sort((a, b) => a.name.text.localeCompare(b.name.text)); + this.skills = res.skills; + // combined label + this.skills.forEach(skill => { + skill.label = `${skill.skill_number} ${skill.name.text}`; + }); }), this.zoneService.getList(this.selectedEvent.id).subscribe(res => { this.zones = res.zones; diff --git a/src/app/people/people.component.html b/src/app/people/people.component.html index da17ee0..46fcf1b 100644 --- a/src/app/people/people.component.html +++ b/src/app/people/people.component.html @@ -1,22 +1,22 @@
-
+
- - - - - - + + + @@ -25,29 +25,29 @@ - - - - - + @@ -59,51 +59,54 @@
+ + {{'first_name' | translate}} + {{'last_name' | translate}} {{'delegate_type' | translate}}{{'zones' | translate}}{{'member' | translate}}{{'delegate_type' | translate}}{{'zones' | translate}}{{'member' | translate}} {{'action' | translate}}
+ {{personAcr.first_name}} {{'empty_hint' | translate}} + {{personAcr.last_name}} {{'empty_hint' | translate}} + {{personAcr.delegate_type.name}} +
{{zone.code}}
 		{{personAcr.member.name.text}}{{personAcr.member.name.text}}
-
-
-
- -
- edit_selected - print_selected -
+ + + +
+ +
+ + +
+
+
+ +
+ edit_selected + print_selected
-
-
- -
- 10 - 100 - 1000 -
+
+
+
+ +
+ 10 + 100 + 1000
+
- - + + -

{{'total_results' | translate}}: {{result.total_count}} {{'people' | translate}}

+

{{'total_results' | translate}}: {{result.total_count}} {{'people' | translate}}

- - - - -
{{ 'person_data' | translate | titlecase }}
-
{{ personAcr.person_position.position.name.text }}
-
{{ personAcr.person_position.open_field }}
-
{{ personAcr.person_position.organization?.name.text }}
+
{{ personAcr.person_position?.position.name.text }}
+
{{ personAcr.person_position?.open_field }}
+
{{ personAcr.person_position?.organizational_unit }}
+
{{ personAcr.person_position?.organization?.name.text }}
+
{{ personAcr.person_position?.skill?.skill_number }} {{ personAcr.person_position?.skill?.name.text }}
+
{{ personAcr.person_position?.member?.name.text }}
-
{{ personAcr.position_delegate_type.delegate_type.name }}
+
{{ personAcr.position_delegate_type?.delegate_type.name }}
- + {{ zone.code }} diff --git a/src/app/positions/positions.component.html b/src/app/positions/positions.component.html index e02b415..6e7449f 100644 --- a/src/app/positions/positions.component.html +++ b/src/app/positions/positions.component.html @@ -38,12 +38,18 @@
- + - +
diff --git a/src/app/positions/positions.component.ts b/src/app/positions/positions.component.ts index 1b5d2ec..d653a55 100644 --- a/src/app/positions/positions.component.ts +++ b/src/app/positions/positions.component.ts @@ -49,6 +49,20 @@ export class PositionsComponent extends WsComponent implements OnInit { ) } + moveToTop(idx: number, pos: PositionDelegateType) { + this.positions[idx] = this.positions[0]; + this.positions[0] = pos; + + this.updatePositionsSort(); + } + + moveToBottom(idx: number, pos: PositionDelegateType) { + this.positions[idx] = this.positions[this.positions.length - 1]; + this.positions[this.positions.length - 1] = pos; + + this.updatePositionsSort(); + } + moveUp(idx: number, pos: PositionDelegateType) { this.positions[idx] = this.positions[idx - 1]; this.positions[idx - 1] = pos; diff --git a/src/app/zones-form/zones-form.component.html b/src/app/zones-form/zones-form.component.html index 40409b4..a7cea1d 100644 --- a/src/app/zones-form/zones-form.component.html +++ b/src/app/zones-form/zones-form.component.html @@ -28,11 +28,22 @@ - +
+
+ +
+
+ +
+
diff --git a/src/app/zones-form/zones-form.component.ts b/src/app/zones-form/zones-form.component.ts index f85bfc0..bd7f4d0 100644 --- a/src/app/zones-form/zones-form.component.ts +++ b/src/app/zones-form/zones-form.component.ts @@ -16,12 +16,16 @@ export class ZonesFormComponent extends WsComponent implements OnInit { @Input() zone: Zone; @Input() selectedEvent: Event; @ViewChild('form') form: NgForm; + color = '#0084ad'; constructor() { super(); } ngOnInit(): void { + if (this.zone.color) { + this.color = this.zone.color; + } } save(): void { diff --git a/src/app/zones/zones.component.html b/src/app/zones/zones.component.html index ab9c831..87db8b5 100644 --- a/src/app/zones/zones.component.html +++ b/src/app/zones/zones.component.html @@ -45,6 +45,9 @@ + + {{'no_zones_found' | translate}} +
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 93f1996..15dc0e7 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -1,4 +1,9 @@ { + "no_zones_found": "No zones found", + "move_to_top": "Move to top", + "move_to_bottom": "Move to bottom", + "move_up": "Move up", + "move_down": "Move down", "edit_selected": "Edit selected", "loading": "Loading", "print_selected": "Print selected", diff --git a/src/types/person-accreditation.ts b/src/types/person-accreditation.ts index a798441..4f9d588 100644 --- a/src/types/person-accreditation.ts +++ b/src/types/person-accreditation.ts @@ -19,14 +19,8 @@ export interface PersonAccreditation { random_hash: string; event: Event; person_position: PersonPosition; - position: string; - member: Member; - skill: Skill; - organization: Organization; - organization_name: string; position_delegate_type: PositionDelegateType; delegate_type: DelegateType; - group_name: string; lines: string; printed: Date; image: Image; diff --git a/src/types/skill.ts b/src/types/skill.ts index 4c13a55..5cdbcd5 100644 --- a/src/types/skill.ts +++ b/src/types/skill.ts @@ -4,6 +4,7 @@ export interface Skill { id: number; skill_number: string; name: I18nText; + label?: string; } export interface SkillContainer {