diff --git a/httpdocs/plp-angular/src/app/app.module.ts b/httpdocs/plp-angular/src/app/app.module.ts
index d693834..8e86486 100644
--- a/httpdocs/plp-angular/src/app/app.module.ts
+++ b/httpdocs/plp-angular/src/app/app.module.ts
@@ -6,7 +6,6 @@ import { NgbModalModule } from '@ng-bootstrap/ng-bootstrap';
import {AppRoutingModule, routingComponents} from './app-routing.module';
import { AppComponent } from './app.component';
import { StartComponent } from './views/start/start.component';
-import {BreadcrumbsModule} from 'ng6-breadcrumbs';
import { BrowserAnimationsModule} from '@angular/platform-browser/animations';
import {CalendarModule, DateAdapter} from 'angular-calendar';
import { adapterFactory} from 'angular-calendar/date-adapters/date-fns';
@@ -38,7 +37,6 @@ import { CustomerContactPersonEditComponent } from './views/customer-management/
import { CustomerNoteViewComponent } from './views/customer-management/customer-view/customer-note-view/customer-note-view.component';
import { CustomerNoteEditComponent } from './views/customer-management/customer-view/customer-note-edit/customer-note-edit.component';
import {CustomerService} from './services/customer.service';
-import { ScrollToModule } from '@nicky-lenaers/ngx-scroll-to';
import { CustomerNoteDetailComponent } from './views/customer-management/customer-view/customer-note-detail/customer-note-detail.component';
import {GridCheckboxRendererComponent} from './grid-cellrenderer/grid-checkbox/grid-checkbox-renderer/grid-checkbox-renderer.component';
import {GridCheckboxEditorComponent} from './grid-cellrenderer/grid-checkbox/grid-checkbox-editor/grid-checkbox-editor.component';
@@ -61,11 +59,12 @@ import { CustomerContactListComponent } from './views/customer-management/custom
import { MeetingListComponent } from './views/start/meeting-list/meeting-list.component';
import { MeetingCalendarComponent } from './views/start/meeting-calendar/meeting-calendar.component';
import { CustomerContactPersonDetailComponent } from './views/customer-management/customer-view/customer-contact-person-detail/customer-contact-person-detail.component';
-import {MeetingService} from './services/meeting.service';
import { InternalMeetingEditComponent } from './views/start/internal-meeting-edit/internal-meeting-edit.component';
import { InternalMeetingDetailComponent } from './views/start/internal-meeting-detail/internal-meeting-detail.component';
import { CalendarLegendComponent } from './components/calendar-legend/calendar-legend.component';
import { CommonService } from './services/common.service';
+import {GridRendererComponent} from './grid-cellrenderer/grid-renderer-component';
+import {GridEditorComponent} from './grid-cellrenderer/grid-editor-component';
registerLocaleData(localeDe);
@@ -92,6 +91,8 @@ registerLocaleData(localeDe);
CustomerNoteViewComponent,
CustomerNoteEditComponent,
CustomerNoteDetailComponent,
+ GridRendererComponent,
+ GridEditorComponent,
GridCheckboxRendererComponent,
GridCheckboxEditorComponent,
GridSelectEditorComponent,
@@ -124,23 +125,15 @@ registerLocaleData(localeDe);
FlatpickrModule.forRoot(),
AppRoutingModule,
HttpClientModule,
- BreadcrumbsModule,
ReactiveFormsModule,
FormsModule,
BrowserAnimationsModule,
- ScrollToModule.forRoot(),
+ // ScrollToModule.forRoot(),
CalendarModule.forRoot({
provide: DateAdapter,
useFactory: adapterFactory
}),
- AgGridModule.withComponents([
- GridCheckboxRendererComponent, GridCheckboxEditorComponent,
- GridSelectRendererComponent, GridSelectEditorComponent,
- GridDateRendererComponent, GridDateEditorComponent,
- GridInputRendererComponent, GridInputEditorComponent,
- GridTextRendererComponent, GridTextEditorComponent,
- GridBlockedRendererComponent, GridBlockedEditorComponent
- ])
+ AgGridModule,
],
providers: [
AppService,
@@ -148,8 +141,7 @@ registerLocaleData(localeDe);
CacheService,
MessageService,
HttpService,
- CustomerService
- MeetingService,
+ CustomerService,
CommonService,
{provide: HTTP_INTERCEPTORS, useClass: HttpClientInterceptor, multi: true},
],
diff --git a/httpdocs/plp-angular/src/app/components/ag-grid-component.ts b/httpdocs/plp-angular/src/app/components/ag-grid-component.ts
index d26fe62..83bc7a8 100644
--- a/httpdocs/plp-angular/src/app/components/ag-grid-component.ts
+++ b/httpdocs/plp-angular/src/app/components/ag-grid-component.ts
@@ -1,4 +1,3 @@
-import {isUndefined} from 'util';
import {path} from '../../environments/path';
import {AgGridLocale} from '../lang/ag-gridlocale';
import {IGridValidationErrors} from '../model/virtual/grid-validation-errors';
@@ -128,7 +127,7 @@ export class AgGridComponent {
* Resizes grid
*/
public gridSizeChanged(params: any): void {
- if (!isUndefined(this.gridParamsApi)) {
+ if (undefined !== this.gridParamsApi) {
this.gridParamsApi.sizeColumnsToFit();
}
}
@@ -202,8 +201,8 @@ export class AgGridComponent {
const errors: IGridValidationErrors[] = [];
primaryColumns.forEach((value) => {
- if (!isUndefined(value.colDef.cellEditorParams)) {
- if (!isUndefined(value.colDef.cellEditorParams.mandatory) && value.colDef.cellEditorParams.mandatory === true) {
+ if (undefined !== value.colDef.cellEditorParams) {
+ if (undefined !== value.colDef.cellEditorParams.mandatory && true === value.colDef.cellEditorParams.mandatory) {
errorColumn.push(value.colDef.field);
}
}
@@ -211,7 +210,7 @@ export class AgGridComponent {
errorColumn.forEach((value, i) => {
this.params.api.forEachNode((rowNode, index) => {
- if (null === rowNode.data[value] || isUndefined(rowNode.data[value])) {
+ if (null === rowNode.data[value] || undefined === rowNode.data[value]) {
errors.push({
column: value,
row: index
diff --git a/httpdocs/plp-angular/src/app/components/form-component.ts b/httpdocs/plp-angular/src/app/components/form-component.ts
index b925b1e..a76d8c2 100644
--- a/httpdocs/plp-angular/src/app/components/form-component.ts
+++ b/httpdocs/plp-angular/src/app/components/form-component.ts
@@ -1,13 +1,18 @@
-import {ScrollToService} from '@nicky-lenaers/ngx-scroll-to';
+// import {ScrollToService} from '@nicky-lenaers/ngx-scroll-to';
export class FormComponent {
public errorMsg: string;
public isCreationMode: boolean;
- protected scrollToService: ScrollToService;
+ // protected scrollToService: ScrollToService;
- constructor(scrollToService: ScrollToService) {
- this.scrollToService = scrollToService;
+ // constructor(scrollToService: ScrollToService) {
+ // this.scrollToService = scrollToService;
+ // this.errorMsg = '';
+ // this.isCreationMode = false;
+ // }
+
+ constructor() {
this.errorMsg = '';
this.isCreationMode = false;
}
@@ -26,7 +31,7 @@ export class FormComponent {
/**
* Configures scrollToService - https://www.npmjs.com/package/@nicky-lenaers/ngx-scroll-to
*/
- public scrollUp(identifier: string): void {
- this.scrollToService.scrollTo({target: identifier});
- }
+ // public scrollUp(identifier: string): void {
+ // this.scrollToService.scrollTo({target: identifier});
+ // }
}
diff --git a/httpdocs/plp-angular/src/app/components/modal/modal.component.ts b/httpdocs/plp-angular/src/app/components/modal/modal.component.ts
index f9e89cf..5b8bcab 100644
--- a/httpdocs/plp-angular/src/app/components/modal/modal.component.ts
+++ b/httpdocs/plp-angular/src/app/components/modal/modal.component.ts
@@ -1,7 +1,7 @@
import {AfterContentInit, Component, EventEmitter, OnInit, Input, Output, Renderer2} from '@angular/core';
@Component({
- selector: 'app-modal',
+ selector: 'app-spt-modal',
templateUrl: './modal.component.html',
styleUrls: ['./modal.component.scss']
})
@@ -52,7 +52,6 @@ export class ModalComponent implements OnInit, AfterContentInit {
/**
* Closes modal dialog with confirm message
- * @param {string} message
*/
public closeWithConfirm(message: string): boolean {
if (confirm(message)) {
@@ -73,7 +72,6 @@ export class ModalComponent implements OnInit, AfterContentInit {
/**
* Returns if modal is open
- * @returns {boolean}
*/
public isOpen(): boolean {
return this.showModal;
diff --git a/httpdocs/plp-angular/src/app/factory/factory.ts b/httpdocs/plp-angular/src/app/factory/factory.ts
index e642d2a..54f3469 100644
--- a/httpdocs/plp-angular/src/app/factory/factory.ts
+++ b/httpdocs/plp-angular/src/app/factory/factory.ts
@@ -7,18 +7,6 @@ import {IUser} from '../model/entities/user';
import {IMeetingType} from '../model/entities/meeting-type';
import {IInternalMeeting} from '../model/entities/internal-meeting';
import {Utils} from '../utils/utils';
-import {IOperator} from '../model/entities/operator';
-import {IOperatorContact} from '../model/entities/operator-contact';
-import {IOperatorNote} from '../model/entities/operator-note';
-import {IOperatorMeeting} from '../model/entities/operator-meeting';
-import {IProduction} from '../model/entities/production';
-import {IProductionContact} from '../model/entities/production-contact';
-import {IProductionNote} from '../model/entities/production-note';
-import {IProductionMeeting} from '../model/entities/production-meeting';
-import {IService} from '../model/entities/service';
-import {IServiceContact} from '../model/entities/service-contact';
-import {IServiceNote} from '../model/entities/service-note';
-import {IServiceMeeting} from '../model/entities/service-meeting';
export class Factory {
static getEmptyUser(): IUser {
@@ -34,14 +22,6 @@ export class Factory {
/**
* Returns empty message
- * @param errorCode
- * @param errorMsg
- * @param successCode
- * @param successMsg
- * @param infoCode
- * @param infoMsg
- * @param clientErrorCode
- * @param optionalInfo
*/
static getEmptyMessage(errorCode: number, errorMsg: string, successCode: number, successMsg: string,
infoCode: number, infoMsg: string, clientErrorCode: number, optionalInfo: string = null): IMessage {
@@ -173,348 +153,6 @@ export class Factory {
return emptyCustomerMeeting as ICustomerMeeting;
}
- /**
- * Returns empty operator
- */
- static getEmptyOperator(): IOperator {
- const emptyOperator: {} = {
- id: null,
- old_plp_id: null,
- name: null,
- name_additional: null,
- street: null,
- street_no: null,
- zip: null,
- city: null,
- country_id: null,
- url: null,
- email: null,
- phone_no: null,
- mobile_no: null,
- fax_no: null,
- tax_no: null,
- invoice_mode: null,
- invoice_comment: null,
- invoice_key: null,
- comment: null,
- active: true,
- };
- return emptyOperator as IOperator;
- }
-
- /**
- * Returns empty operator contact person
- */
- static getEmptyOperatorContact(operatorId: number = null): IOperatorContact {
- const emptyOperatorContact: {} = {
- id: null,
- operator_id: operatorId,
- gender: null,
- firstname: null,
- lastname: null,
- email: null,
- phone_no: null,
- mobile_no: null,
- fax_no: null,
- department: null,
- date_of_birth: null,
- comment: null,
- street: null,
- street_no: null,
- zip: null,
- city: null,
- country_id: null,
- is_xmas_mail_recipient: false,
- };
- return emptyOperatorContact as IOperatorContact;
- }
-
- static getEmptyOperatorNote(operatorId: number = null, noteDate: string = null): IOperatorNote {
- const emptyOperatorNote: {} = {
- id: operatorId,
- operator_id: null,
- operator_contact_id: null,
- user_id: null,
- gender: null,
- firstname: null,
- lastname: null,
- email: null,
- phone_no: null,
- mobile_no: null,
- fax_no: null,
- department: null,
- title: null,
- comment: null,
- note_date: noteDate,
- creation_date: null,
- creation_user_id: null,
- creation_user_firstname: null,
- creation_user_lastname: null
- };
- return emptyOperatorNote as IOperatorNote;
- }
-
- static getEmptyOperatorMeeting(operatorId: number = null): IOperatorMeeting {
- const emptyOperatorMeeting: {} = {
- id: null,
- operator_id: operatorId,
- operator_user_id: null,
- owner_user_id: null,
- meeting_type_id: null,
- is_option_meeting: false,
- title: null,
- description: null,
- start_date: Utils.getCurrentDate() + ' 09:00:00',
- end_date: Utils.getCurrentDate() + ' 18:00:00',
- operator_contact_id: null,
- gender: null,
- firstname: null,
- lastname: null,
- email: null,
- phone_no: null,
- mobile_no: null,
- department: null,
- street: null,
- street_no: null,
- zip: null,
- city: null,
- country_id: null,
- report: null,
- first_reminder_sent: false,
- second_reminder_sent: false,
- report_done: false,
- report_reminder_sent: false,
- creation_date: null,
- v_participants: [],
- v_is_editable: true
- };
- return emptyOperatorMeeting as IOperatorMeeting;
- }
-
- static getEmptyProduction(): IProduction {
- const emptyProduction: {} = {
- id: null,
- old_plp_id: null,
- name: null,
- name_additional: null,
- street: null,
- street_no: null,
- zip: null,
- city: null,
- country_id: null,
- url: null,
- email: null,
- phone_no: null,
- mobile_no: null,
- fax_no: null,
- tax_no: null,
- invoice_mode: null,
- invoice_comment: null,
- invoice_key: null,
- comment: null,
- active: true,
- };
- return emptyProduction as IProduction;
- }
-
- static getEmptyProductionContact(productionId: number = null): IProductionContact {
- const emptyProductionContact: {} = {
- id: null,
- production_id: productionId,
- gender: null,
- firstname: null,
- lastname: null,
- email: null,
- phone_no: null,
- mobile_no: null,
- fax_no: null,
- department: null,
- date_of_birth: null,
- comment: null,
- street: null,
- street_no: null,
- zip: null,
- city: null,
- country_id: null,
- is_xmas_mail_recipient: false,
- };
- return emptyProductionContact as IProductionContact;
- }
-
- static getEmptyProductionNote(productionId: number = null, noteDate: string = null): IProductionNote {
- const emptyProductionNote: {} = {
- id: productionId,
- production_id: null,
- production_contact_id: null,
- user_id: null,
- gender: null,
- firstname: null,
- lastname: null,
- email: null,
- phone_no: null,
- mobile_no: null,
- fax_no: null,
- department: null,
- title: null,
- comment: null,
- note_date: noteDate,
- creation_date: null,
- creation_user_id: null,
- creation_user_firstname: null,
- creation_user_lastname: null
- };
- return emptyProductionNote as IProductionNote;
- }
-
- static getEmptyProductionMeeting(productionId: number = null): IProductionMeeting {
- const emptyProductionMeeting: {} = {
- id: null,
- production_id: productionId,
- production_user_id: null,
- owner_user_id: null,
- meeting_type_id: null,
- is_option_meeting: false,
- title: null,
- description: null,
- start_date: Utils.getCurrentDate() + ' 09:00:00',
- end_date: Utils.getCurrentDate() + ' 18:00:00',
- production_contact_id: null,
- gender: null,
- firstname: null,
- lastname: null,
- email: null,
- phone_no: null,
- mobile_no: null,
- department: null,
- street: null,
- street_no: null,
- zip: null,
- city: null,
- country_id: null,
- report: null,
- first_reminder_sent: false,
- second_reminder_sent: false,
- report_done: false,
- report_reminder_sent: false,
- creation_date: null,
- v_participants: [],
- v_is_editable: true
- };
- return emptyProductionMeeting as IProductionMeeting;
- }
-
- static getEmptyService(): IService {
- const emptyService: {} = {
- id: null,
- old_plp_id: null,
- name: null,
- name_additional: null,
- street: null,
- street_no: null,
- zip: null,
- city: null,
- country_id: null,
- url: null,
- email: null,
- phone_no: null,
- mobile_no: null,
- fax_no: null,
- tax_no: null,
- invoice_mode: null,
- invoice_comment: null,
- invoice_key: null,
- comment: null,
- active: true,
- };
- return emptyService as IService;
- }
-
- static getEmptyServiceContact(serviceId: number = null): IServiceContact {
- const emptyServiceContact: {} = {
- id: null,
- service_id: serviceId,
- gender: null,
- firstname: null,
- lastname: null,
- email: null,
- phone_no: null,
- mobile_no: null,
- fax_no: null,
- department: null,
- date_of_birth: null,
- comment: null,
- street: null,
- street_no: null,
- zip: null,
- city: null,
- country_id: null,
- is_xmas_mail_recipient: false,
- };
- return emptyServiceContact as IServiceContact;
- }
-
- static getEmptyServiceNote(serviceId: number = null, noteDate: string = null): IServiceNote {
- const emptyProductionNote: {} = {
- id: serviceId,
- service_id: null,
- service_contact_id: null,
- user_id: null,
- gender: null,
- firstname: null,
- lastname: null,
- email: null,
- phone_no: null,
- mobile_no: null,
- fax_no: null,
- department: null,
- title: null,
- comment: null,
- note_date: noteDate,
- creation_date: null,
- creation_user_id: null,
- creation_user_firstname: null,
- creation_user_lastname: null
- };
- return emptyProductionNote as IServiceNote;
- }
-
- static getEmptyServiceMeeting(serviceId: number = null): IServiceMeeting {
- const emptyServiceMeeting: {} = {
- id: null,
- service_id: serviceId,
- service_user_id: null,
- owner_user_id: null,
- meeting_type_id: null,
- is_option_meeting: false,
- title: null,
- description: null,
- start_date: Utils.getCurrentDate() + ' 09:00:00',
- end_date: Utils.getCurrentDate() + ' 18:00:00',
- service_contact_id: null,
- gender: null,
- firstname: null,
- lastname: null,
- email: null,
- phone_no: null,
- mobile_no: null,
- department: null,
- street: null,
- street_no: null,
- zip: null,
- city: null,
- country_id: null,
- report: null,
- first_reminder_sent: false,
- second_reminder_sent: false,
- report_done: false,
- report_reminder_sent: false,
- creation_date: null,
- v_participants: [],
- v_is_editable: true
- };
- return emptyServiceMeeting as IServiceMeeting;
- }
-
static getEmptyInternalMeeting(): IInternalMeeting {
const emptyInternalMeeting: {} = {
id: null,
diff --git a/httpdocs/plp-angular/src/app/grid-cellrenderer/grid-date/grid-date-renderer/grid-date-renderer.component.ts b/httpdocs/plp-angular/src/app/grid-cellrenderer/grid-date/grid-date-renderer/grid-date-renderer.component.ts
index 9c43b33..8c80f31 100644
--- a/httpdocs/plp-angular/src/app/grid-cellrenderer/grid-date/grid-date-renderer/grid-date-renderer.component.ts
+++ b/httpdocs/plp-angular/src/app/grid-cellrenderer/grid-date/grid-date-renderer/grid-date-renderer.component.ts
@@ -1,5 +1,4 @@
import {Component} from '@angular/core';
-import {isUndefined} from 'util';
import {GridRendererComponent} from '../../grid-renderer-component';
@Component({
@@ -14,12 +13,11 @@ export class GridDateRendererComponent extends GridRendererComponent {
/**
* Initialize cell renderer (gets called on cell rendering and after editing / refresh)
- * @param params
*/
agInit(params: any): void {
super.agInit(params);
let tempValue: string[] = [];
- if (null === this.value || isUndefined(this.value)) {
+ if (null === this.value || undefined === this.value) {
this.displayedValue = '';
} else {
tempValue = this.value.split('-');
diff --git a/httpdocs/plp-angular/src/app/grid-cellrenderer/grid-editor-component.ts b/httpdocs/plp-angular/src/app/grid-cellrenderer/grid-editor-component.ts
index 92f7bc6..b01cd73 100644
--- a/httpdocs/plp-angular/src/app/grid-cellrenderer/grid-editor-component.ts
+++ b/httpdocs/plp-angular/src/app/grid-cellrenderer/grid-editor-component.ts
@@ -1,8 +1,13 @@
-import {ElementRef, OnInit, ViewChild} from '@angular/core';
+import {Component, ElementRef, OnInit, ViewChild} from '@angular/core';
import {ICellEditorAngularComp} from 'ag-grid-angular';
import {IGridCellParams} from './grid-cell-params';
+@Component({
+ template: '',
+})
+
export class GridEditorComponent implements OnInit, ICellEditorAngularComp {
+
@ViewChild('editorInput', { static: true }) inputField: ElementRef;
readonly GRID_ERROR_EMPTY: string = 'Bitte geben Sie einen Wert ein.';
@@ -25,7 +30,6 @@ export class GridEditorComponent implements OnInit, ICellEditorAngularComp {
/**
* Initialize cell renderer (gets called on cell rendering and after editing / refresh)
- * @param params
*/
agInit(params: any): void {
this.params = params;
@@ -47,7 +51,6 @@ export class GridEditorComponent implements OnInit, ICellEditorAngularComp {
/**
* Cancels before value input (this editor is never editable)
- * @returns {boolean}
*/
public isCancelBeforeStart(): boolean {
return false;
@@ -55,7 +58,6 @@ export class GridEditorComponent implements OnInit, ICellEditorAngularComp {
/**
* Cancels input of inserted value under certain conditions
- * @returns {boolean}
*/
isCancelAfterEnd(): boolean {
return false;
@@ -63,7 +65,6 @@ export class GridEditorComponent implements OnInit, ICellEditorAngularComp {
/**
* Changes value on click
- * @param e
*/
public valueIsChanged = (e) => {
this.value = e.srcElement.value;
diff --git a/httpdocs/plp-angular/src/app/grid-cellrenderer/grid-factory.ts b/httpdocs/plp-angular/src/app/grid-cellrenderer/grid-factory.ts
index 42336d1..5ea5210 100644
--- a/httpdocs/plp-angular/src/app/grid-cellrenderer/grid-factory.ts
+++ b/httpdocs/plp-angular/src/app/grid-cellrenderer/grid-factory.ts
@@ -3,13 +3,6 @@ import {IGridCellParams} from './grid-cell-params';
export class GridFactory {
/**
* Returns param object for cell renderer and -editors
- * @param {string} type
- * @param {number} min
- * @param {number} max
- * @param {string} unit
- * @param {boolean} mandatory
- * @param {number} altValue
- * @returns {IGridCellParams}
*/
static getGridCellParams(type: string = null, min: number = null,
max: number = null, unit: string = null,
diff --git a/httpdocs/plp-angular/src/app/grid-cellrenderer/grid-input/grid-input-editor/grid-input-editor.component.ts b/httpdocs/plp-angular/src/app/grid-cellrenderer/grid-input/grid-input-editor/grid-input-editor.component.ts
index 651a6cf..69fa365 100644
--- a/httpdocs/plp-angular/src/app/grid-cellrenderer/grid-input/grid-input-editor/grid-input-editor.component.ts
+++ b/httpdocs/plp-angular/src/app/grid-cellrenderer/grid-input/grid-input-editor/grid-input-editor.component.ts
@@ -12,7 +12,6 @@ import {Utils} from '../../../utils/utils';
export class GridInputEditorComponent extends GridEditorComponent {
/**
* Initialize cell renderer (gets called on cell rendering and after editing / refresh)
- * @param params
*/
agInit(params: any): void {
super.agInit(params);
@@ -37,7 +36,6 @@ export class GridInputEditorComponent extends GridEditorComponent {
/**
* Cancels input of inserted value under certain conditions
- * @returns {boolean}
*/
isCancelAfterEnd(): boolean {
if (this.cellParams.mandatory && (null === this.value || this.value.toString().trim() === '')) {
@@ -46,20 +44,20 @@ export class GridInputEditorComponent extends GridEditorComponent {
return true;
}
- if (this.cellParams.type == AgGridComponentConst.CELL_VALUE_TYPE_INT && !Utils.isInteger(this.value)) {
+ if (this.cellParams.type === AgGridComponentConst.CELL_VALUE_TYPE_INT && !Utils.isInteger(this.value)) {
// No int value given
AgGridComponentConst.setGridInputError(this.GRID_ERROR_INT);
return true;
}
- if (this.cellParams.type == AgGridComponentConst.CELL_VALUE_TYPE_FLOAT && !Utils.isFloat(this.value)) {
+ if (this.cellParams.type === AgGridComponentConst.CELL_VALUE_TYPE_FLOAT && !Utils.isFloat(this.value)) {
// No float value given
AgGridComponentConst.setGridInputError(this.GRID_ERROR_FLOAT);
return true;
}
- if (this.cellParams.type == AgGridComponentConst.CELL_VALUE_TYPE_INT ||
- this.cellParams.type == AgGridComponentConst.CELL_VALUE_TYPE_FLOAT) {
+ if (this.cellParams.type === AgGridComponentConst.CELL_VALUE_TYPE_INT ||
+ this.cellParams.type === AgGridComponentConst.CELL_VALUE_TYPE_FLOAT) {
const numericVal: number = Number(String(this.value).replace(',', '.'));
if (null !== this.cellParams.min && numericVal < Number(this.cellParams.min)) {
// Check on alternative value
@@ -101,7 +99,7 @@ export class GridInputEditorComponent extends GridEditorComponent {
/**
* Changes value on click
- * @param e
+ * todo maybe this should get refacotred properly?
*/
public valueIsChanged = (e) => {
this.value = e.srcElement.value;
diff --git a/httpdocs/plp-angular/src/app/grid-cellrenderer/grid-input/grid-input-renderer/grid-input-renderer.component.ts b/httpdocs/plp-angular/src/app/grid-cellrenderer/grid-input/grid-input-renderer/grid-input-renderer.component.ts
index 3275288..7b3d2e1 100644
--- a/httpdocs/plp-angular/src/app/grid-cellrenderer/grid-input/grid-input-renderer/grid-input-renderer.component.ts
+++ b/httpdocs/plp-angular/src/app/grid-cellrenderer/grid-input/grid-input-renderer/grid-input-renderer.component.ts
@@ -11,7 +11,6 @@ import {AgGridComponentConst} from '../../../components/ag-grid-component-const'
export class GridInputRendererComponent extends GridRendererComponent {
/**
* Initialize cell renderer (gets called on cell rendering and after editing / refresh)
- * @param params
*/
agInit(params: any): void {
super.agInit(params);
diff --git a/httpdocs/plp-angular/src/app/grid-cellrenderer/grid-renderer-component.ts b/httpdocs/plp-angular/src/app/grid-cellrenderer/grid-renderer-component.ts
index 86ab1e5..074fe18 100644
--- a/httpdocs/plp-angular/src/app/grid-cellrenderer/grid-renderer-component.ts
+++ b/httpdocs/plp-angular/src/app/grid-cellrenderer/grid-renderer-component.ts
@@ -1,8 +1,13 @@
-import {OnInit} from '@angular/core';
+import {Component, OnInit} from '@angular/core';
import {ICellRendererAngularComp} from 'ag-grid-angular';
import {IGridCellParams} from './grid-cell-params';
+@Component({
+ template: '',
+})
+
export class GridRendererComponent implements OnInit, ICellRendererAngularComp {
+
public value: any;
public params: any;
public cellParams: IGridCellParams;
@@ -16,7 +21,6 @@ export class GridRendererComponent implements OnInit, ICellRendererAngularComp {
/**
* Initialize cell renderer (gets called on cell rendering and after editing / refresh)
- * @param params
*/
agInit(params: any): void {
this.params = params;
@@ -30,7 +34,6 @@ export class GridRendererComponent implements OnInit, ICellRendererAngularComp {
/**
* Sets value
- * @param value
*/
setValue(value: any): void {
this.value = value;
@@ -38,7 +41,6 @@ export class GridRendererComponent implements OnInit, ICellRendererAngularComp {
/**
* Refreshes cell - Gets called after editing
- * @param params
*/
refresh(params: any): boolean {
return false;
diff --git a/httpdocs/plp-angular/src/app/grid-cellrenderer/grid-select/grid-select-editor/grid-select-editor.component.ts b/httpdocs/plp-angular/src/app/grid-cellrenderer/grid-select/grid-select-editor/grid-select-editor.component.ts
index 38bfb55..89a43ad 100644
--- a/httpdocs/plp-angular/src/app/grid-cellrenderer/grid-select/grid-select-editor/grid-select-editor.component.ts
+++ b/httpdocs/plp-angular/src/app/grid-cellrenderer/grid-select/grid-select-editor/grid-select-editor.component.ts
@@ -1,6 +1,5 @@
import {Component} from '@angular/core';
import {IGridSelectItem} from '../grid-select-item';
-import {isUndefined} from 'util';
import {GridEditorComponent} from '../../grid-editor-component';
import {GridSelectFactory} from '../grid-select-factory';
import {IGridCellEditorParams} from '../../grid-cell-editor-params';
@@ -37,7 +36,7 @@ export class GridSelectEditorComponent extends GridEditorComponent {
const itemRange: any[] = (params.node.data.hasOwnProperty(relatedValue) && null !== params.node.data[relatedValue]) ?
cellEditorParams.values[params.node.data[relatedValue]] : null;
- if (null !== itemRange && !isUndefined(itemRange)) {
+ if (null !== itemRange && undefined !== itemRange) {
itemRange.forEach(item => {
this.values.push(GridSelectFactory.getGridSelectItem(item, this.itemKey, this.itemValueKeys));
});
@@ -47,17 +46,17 @@ export class GridSelectEditorComponent extends GridEditorComponent {
// Filter all items used by other selects (compareData)
const compareExcludeKey: string = cellEditorParams.exclusiveCompareDataKey;
const excludedItemKeys: {} = {};
- for (let i = 0; i < cellEditorParams.exclusiveCompareData.length; i++) {
- if (cellEditorParams.exclusiveCompareData[i][compareExcludeKey] != this.value) {
- excludedItemKeys[cellEditorParams.exclusiveCompareData[i][compareExcludeKey]] = 1;
+ cellEditorParams.exclusiveCompareData.forEach(item => {
+ if (item[compareExcludeKey] !== this.value) {
+ excludedItemKeys[item[compareExcludeKey]] = 1;
}
- }
+ });
// This select contains only values that are not selected by other selects and it's own current item
- for (let h = 0; h < cellEditorParams.values.length; h++) {
- if (!excludedItemKeys.hasOwnProperty(cellEditorParams.values[h][this.itemKey])) {
- this.values.push(GridSelectFactory.getGridSelectItem(cellEditorParams.values[h], this.itemKey, this.itemValueKeys));
+ cellEditorParams.values.forEach(item => {
+ if (!excludedItemKeys.hasOwnProperty(item[this.itemKey])) {
+ this.values.push(GridSelectFactory.getGridSelectItem(item, this.itemKey, this.itemValueKeys));
}
- }
+ });
} else {
// Static values (default behaviour)
this.values = params.values;
@@ -74,13 +73,12 @@ export class GridSelectEditorComponent extends GridEditorComponent {
/**
* Makes selectItem out of ID
- * @param e
*/
public getSelectedItem(e: any): IGridSelectItem {
- if (e != null && e != '') {
- for (let i = 0; i < this.values.length; i++) {
- if (this.values[i].key == e) {
- this.newValue = this.values[i];
+ if (null !== e && e !== '') {
+ for (const item of this.values) {
+ if (item.key === e) {
+ this.newValue = item;
break;
}
}
diff --git a/httpdocs/plp-angular/src/app/grid-cellrenderer/grid-select/grid-select-factory.ts b/httpdocs/plp-angular/src/app/grid-cellrenderer/grid-select/grid-select-factory.ts
index bb160e9..5b4e3f7 100644
--- a/httpdocs/plp-angular/src/app/grid-cellrenderer/grid-select/grid-select-factory.ts
+++ b/httpdocs/plp-angular/src/app/grid-cellrenderer/grid-select/grid-select-factory.ts
@@ -5,20 +5,6 @@ import {IGridSelectItem} from './grid-select-item';
export class GridSelectFactory {
/**
* Returns select item for grid
- * @param headerName
- * @param field
- * @param editable
- * @param values
- * @param itemKey
- * @param itemValueKeys
- * @param mandatory
- * @param relatesOnDgField
- * @param headerClass
- * @param pinned
- * @param cellClass
- * @param exclusive
- * @param exclusiveCompareData
- * @param exclusiveCompareDataKey
*/
static getGridSelect(headerName: string, field: string, editable: boolean, values: any[], itemKey: string,
itemValueKeys: string[], mandatory: boolean = true, relatesOnDgField: string = null,
@@ -51,7 +37,7 @@ export class GridSelectFactory {
}
};
if (mandatory) {
- res.cellClassRules = {
+ res['cellClassRules'] = {
error(params) {
return params.value == null;
}
@@ -62,20 +48,6 @@ export class GridSelectFactory {
/**
* Returns select item for grid without renderer and editor
- * @param headerName
- * @param field
- * @param editable
- * @param values
- * @param itemKey
- * @param itemValueKeys
- * @param mandatory
- * @param relatesOnDgField
- * @param headerClass
- * @param pinned
- * @param cellClass
- * @param exclusive
- * @param exclusiveCompareData
- * @param exclusiveCompareDataKey
*/
static getGridSelectForSelectors(headerName: string, field: string, editable: boolean, values: any[], itemKey: string,
itemValueKeys: string[], mandatory: boolean = true, relatesOnDgField: string = null,
@@ -86,17 +58,13 @@ export class GridSelectFactory {
headerName, field, editable, values, itemKey, itemValueKeys, mandatory, relatesOnDgField,
headerClass, pinned, cellClass, exclusive, exclusiveCompareData, exclusiveCompareDataKey
);
- delete res.cellRenderer;
- delete res.cellEditor;
+ delete res['cellRenderer'];
+ delete res['cellEditor'];
return res;
}
/**
* Returns array of grid select items
- * @param objArray
- * @param key
- * @param valueKeys
- * @param mandatory
*/
static getGridSelectItems(objArray: any[], key: string, valueKeys: string[], mandatory: boolean = true): IGridSelectItem[] {
const res: IGridSelectItem[] = [];
@@ -143,8 +111,6 @@ export class GridSelectFactory {
/**
* Returns displayed value of grid item
- * @param obj
- * @param valueKeys
*/
static getGridSelectItemValue(obj: any, valueKeys: string[]): string {
let value = '';
diff --git a/httpdocs/plp-angular/src/app/grid-cellrenderer/grid-select/grid-select-renderer/grid-select-renderer.component.ts b/httpdocs/plp-angular/src/app/grid-cellrenderer/grid-select/grid-select-renderer/grid-select-renderer.component.ts
index 06b91d0..bd66b53 100644
--- a/httpdocs/plp-angular/src/app/grid-cellrenderer/grid-select/grid-select-renderer/grid-select-renderer.component.ts
+++ b/httpdocs/plp-angular/src/app/grid-cellrenderer/grid-select/grid-select-renderer/grid-select-renderer.component.ts
@@ -22,7 +22,6 @@ export class GridSelectRendererComponent extends GridRendererComponent {
/**
* Initialize cell renderer (gets called on cell rendering and after editing / refresh)
- * @param params
*/
agInit(params: any): void {
super.agInit(params);
@@ -37,16 +36,15 @@ export class GridSelectRendererComponent extends GridRendererComponent {
/**
* Case for static item range (all items in column have the same select items - default)
- * @param params
*/
private setStaticValue(params: any): void {
if (this.itemRange === null || undefined === this.itemRange) {
// Item range is the same for all rows
this.itemRange = params.colDef.cellEditorParams.values as IGridSelectItem[];
if (null !== params.value) {
- for (let i = 0; i < this.itemRange.length; i++) {
- if (this.itemRange[i].key === params.value) {
- this.value = this.itemRange[i].value;
+ for (const item of this.itemRange) {
+ if (item.key === params.value) {
+ this.value = item.value;
break;
}
}
@@ -58,7 +56,6 @@ export class GridSelectRendererComponent extends GridRendererComponent {
/**
* Case for item range related on other dg grid field (Select has always to be updated within init)
- * @param params
*/
private setRelatedValue(params: any): void {
// @TODO: Might be checked
@@ -67,14 +64,14 @@ export class GridSelectRendererComponent extends GridRendererComponent {
const itemValueKeys: string[] = params.colDef.cellEditorParams.itemValueKeys;
// Get item range by related value
- this.itemRange = params.data.hasOwnProperty(relatedValue) && null !== params.data[relatedValue]; ) ?
- params.colDef.cellEditorParams.values[params.data[relatedValue]]; : null;
+ this.itemRange = params.data.hasOwnProperty(relatedValue) && null !== params.data[relatedValue] ?
+ params.colDef.cellEditorParams.values[params.data[relatedValue]] : null;
- if (null !== params.value && null !== this.itemRange) { } } {) {
+ if (null !== params.value && null !== this.itemRange) {
// let value: string = GridFactory.getGridSelectItemValue()
- for (let i = 0; i < this.itemRange.length; i++) {
- if (this.itemRange[i][itemKey] === params.value) {
- this.value = GridSelectFactory.getGridSelectItemValue(this.itemRange[i], itemValueKeys);
+ for (const item of this.itemRange) {
+ if (item[itemKey] === params.value) {
+ this.value = GridSelectFactory.getGridSelectItemValue(item, itemValueKeys);
break;
}
}
diff --git a/httpdocs/plp-angular/src/app/grid-cellrenderer/grid-text/grid-text-editor/grid-text-editor.component.ts b/httpdocs/plp-angular/src/app/grid-cellrenderer/grid-text/grid-text-editor/grid-text-editor.component.ts
index 378b37b..9989c55 100644
--- a/httpdocs/plp-angular/src/app/grid-cellrenderer/grid-text/grid-text-editor/grid-text-editor.component.ts
+++ b/httpdocs/plp-angular/src/app/grid-cellrenderer/grid-text/grid-text-editor/grid-text-editor.component.ts
@@ -10,7 +10,6 @@ import {GridEditorComponent} from '../../grid-editor-component';
export class GridTextEditorComponent extends GridEditorComponent {
/**
* Cancels before value input (this editor is never editable)
- * @returns {boolean}
*/
public isCancelBeforeStart(): boolean {
return true;
diff --git a/httpdocs/plp-angular/src/app/grid-cellrenderer/grid-text/grid-text-renderer/grid-text-renderer.component.ts b/httpdocs/plp-angular/src/app/grid-cellrenderer/grid-text/grid-text-renderer/grid-text-renderer.component.ts
index 1a8fffc..db4f660 100644
--- a/httpdocs/plp-angular/src/app/grid-cellrenderer/grid-text/grid-text-renderer/grid-text-renderer.component.ts
+++ b/httpdocs/plp-angular/src/app/grid-cellrenderer/grid-text/grid-text-renderer/grid-text-renderer.component.ts
@@ -11,17 +11,16 @@ import {AgGridComponentConst} from '../../../components/ag-grid-component-const'
export class GridTextRendererComponent extends GridRendererComponent {
/**
* Initialize cell renderer (gets called on cell rendering and after editing / refresh)
- * @param params
*/
agInit(params: any): void {
super.agInit(params);
if (undefined !== this.cellParams) {
// Replace "." with "," for display purpose
if (this.cellParams.type === AgGridComponentConst.CELL_VALUE_TYPE_FLOAT) {
- this.value = isNaN(this.value) || null === this.value; ) ? ''; : this.value = parseFloat(parseFloat(this.value).toFixed(2)).toLocaleString('de-DE');
+ this.value = isNaN(this.value) || null === this.value ? '' : parseFloat(parseFloat(this.value).toFixed(2)).toLocaleString('de-DE');
}
- if (this.cellParams.type == AgGridComponentConst.CELL_VALUE_TYPE_INT) {
- this.value = isNaN(this.value) || null === this.value; ) ? ''; : this.value = parseInt(parseInt(this.value).toFixed(2)).toLocaleString('de-DE');
+ if (this.cellParams.type === AgGridComponentConst.CELL_VALUE_TYPE_INT) {
+ this.value = isNaN(this.value) || null === this.value? '' : this.value = parseInt(parseInt(this.value).toFixed(2)).toLocaleString('de-DE');
}
}
}
diff --git a/httpdocs/plp-angular/src/app/interceptor/route-interceptor.ts b/httpdocs/plp-angular/src/app/interceptor/route-interceptor.ts
index 01697e8..b09dbe7 100644
--- a/httpdocs/plp-angular/src/app/interceptor/route-interceptor.ts
+++ b/httpdocs/plp-angular/src/app/interceptor/route-interceptor.ts
@@ -11,7 +11,6 @@ export class RouteInterceptor {
/**
* Constructor of router service
- * @param {Router} router
*/
constructor(private router: Router, private appService: AppService) {
// Observe login state
diff --git a/httpdocs/plp-angular/src/app/model/entities/customer-meeting.ts b/httpdocs/plp-angular/src/app/model/entities/customer-meeting.ts
index 2051e6d..2a8f0c3 100644
--- a/httpdocs/plp-angular/src/app/model/entities/customer-meeting.ts
+++ b/httpdocs/plp-angular/src/app/model/entities/customer-meeting.ts
@@ -1,16 +1,11 @@
import {EntityInterface} from '../interface/entity-interface';
import {ICustomerMeetingParticipant} from './customer-meeting-participant';
+import {MeetingInterface} from '../interface/meeting-interface';
-export interface ICustomerMeeting extends EntityInterface {
+export interface ICustomerMeeting extends EntityInterface, MeetingInterface {
customer_id: number;
- creation_user_id: number;
- owner_user_id: number;
meeting_type_id: number;
is_option_meeting: boolean;
- title: string;
- description: string;
- start_date: string;
- end_date: string;
customer_contact_id: number;
gender: string;
firstname: string;
@@ -24,11 +19,6 @@ export interface ICustomerMeeting extends EntityInterface {
zip: string;
city: string;
country_id: number;
- report: string;
- first_reminder_sent: boolean;
- second_reminder_sent: boolean;
- report_reminder_sent: boolean;
- creation_date: string;
v_participants: ICustomerMeetingParticipant[];
v_is_editable: boolean;
}
diff --git a/httpdocs/plp-angular/src/app/model/entities/internal-meeting.ts b/httpdocs/plp-angular/src/app/model/entities/internal-meeting.ts
index 3d143dd..4286a90 100644
--- a/httpdocs/plp-angular/src/app/model/entities/internal-meeting.ts
+++ b/httpdocs/plp-angular/src/app/model/entities/internal-meeting.ts
@@ -1,18 +1,9 @@
import {EntityInterface} from '../interface/entity-interface';
import {IInternalMeetingParticipant} from './internal-meeting-participant';
+import {MeetingInterface} from '../interface/meeting-interface';
-export interface IInternalMeeting extends EntityInterface {
+export interface IInternalMeeting extends EntityInterface, MeetingInterface {
creation_user_id: number;
- owner_user_id: number;
- title: string;
- description: string;
- start_date: string;
- end_date: string;
- report: string;
- first_reminder_sent: boolean;
- second_reminder_sent: boolean;
- report_reminder_sent: boolean;
- creation_date: string;
v_participants: IInternalMeetingParticipant[];
v_is_editable: boolean;
}
diff --git a/httpdocs/plp-angular/src/app/model/entities/operator-contact.ts b/httpdocs/plp-angular/src/app/model/entities/operator-contact.ts
deleted file mode 100644
index 25db78a..0000000
--- a/httpdocs/plp-angular/src/app/model/entities/operator-contact.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import {EntityInterface} from '../interface/entity-interface';
-
-export interface IOperatorContact extends EntityInterface {
- operator_id: string;
- gender: string;
- firstname: string;
- lastname: string;
- email: string;
- phone_no: string;
- mobile_no: string;
- fax_no: string;
- department: string;
- date_of_birth: string;
- comment: string;
- street: string;
- street_no: string;
- zip: string;
- city: string;
- country_id: number;
- is_xmas_mail_recipient: boolean;
-}
diff --git a/httpdocs/plp-angular/src/app/model/entities/operator-meeting-participant.ts b/httpdocs/plp-angular/src/app/model/entities/operator-meeting-participant.ts
deleted file mode 100644
index 5218961..0000000
--- a/httpdocs/plp-angular/src/app/model/entities/operator-meeting-participant.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import {EntityInterface} from '../interface/entity-interface';
-
-export interface IOperatorMeetingParticipant extends EntityInterface {
- operator_meeting_id: number;
- participant_user_id: number;
-}
diff --git a/httpdocs/plp-angular/src/app/model/entities/operator-meeting.ts b/httpdocs/plp-angular/src/app/model/entities/operator-meeting.ts
deleted file mode 100644
index 6cc7a63..0000000
--- a/httpdocs/plp-angular/src/app/model/entities/operator-meeting.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import {EntityInterface} from '../interface/entity-interface';
-import {IOperatorMeetingParticipant} from './operator-meeting-participant';
-
-export interface IOperatorMeeting extends EntityInterface {
- operator_id: number;
- creation_user_id: number;
- owner_user_id: number;
- meeting_type_id: number;
- title: string;
- description: string;
- start_date: string;
- end_date: string;
- operator_contact_id: number;
- gender: string;
- firstname: string;
- lastname: string;
- email: string;
- phone_no: string;
- mobile_no: string;
- department: string;
- street: string;
- street_no: string;
- zip: string;
- city: string;
- country_id: number;
- report: string;
- first_reminder_sent: boolean;
- second_reminder_sent: boolean;
- report_reminder_sent: boolean;
- creation_date: string;
- v_participants: IOperatorMeetingParticipant[];
- v_is_editable: boolean;
-}
diff --git a/httpdocs/plp-angular/src/app/model/entities/operator-note.ts b/httpdocs/plp-angular/src/app/model/entities/operator-note.ts
deleted file mode 100644
index abe4b86..0000000
--- a/httpdocs/plp-angular/src/app/model/entities/operator-note.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import {EntityInterface} from '../interface/entity-interface';
-
-export interface IOperatorNote extends EntityInterface {
- operator_id: number;
- operator_contact_id: number;
- user_id: number;
- gender: string;
- firstname: string;
- lastname: string;
- email: string;
- phone_no: string;
- mobile_no: string;
- fax_no: string;
- department: string;
- title: string;
- comment: string;
- note_date: string;
- creation_date: string;
- creation_user_id: number;
- creation_user_firstname: string;
- creation_user_lastname: string;
-}
diff --git a/httpdocs/plp-angular/src/app/model/entities/operator.ts b/httpdocs/plp-angular/src/app/model/entities/operator.ts
deleted file mode 100644
index e0eddd4..0000000
--- a/httpdocs/plp-angular/src/app/model/entities/operator.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import {EntityInterface} from '../interface/entity-interface';
-import {IOperatorContact} from './operator-contact';
-import {IOperatorNote} from './operator-note';
-import {IOperatorMeeting} from './operator-meeting';
-
-export interface IOperator extends EntityInterface {
- old_plp_id: string;
- name: string;
- name_additional: string;
- street: string;
- street_no: string;
- zip: string;
- city: string;
- country_id: number;
- url: string;
- email: string;
- phone_no: string;
- mobile_no: string;
- fax_no: string;
- comment: string;
- tax_no: string;
- invoice_mode: string;
- invoice_comment: string;
- invoice_key: string;
- active: boolean;
- v_operator_contacts: IOperatorContact[];
- v_operator_notes: IOperatorNote[];
- v_operator_meetings: IOperatorMeeting[];
-}
diff --git a/httpdocs/plp-angular/src/app/model/entities/production-contact.ts b/httpdocs/plp-angular/src/app/model/entities/production-contact.ts
deleted file mode 100644
index a1f4bff..0000000
--- a/httpdocs/plp-angular/src/app/model/entities/production-contact.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import {EntityInterface} from '../interface/entity-interface';
-
-export interface IProductionContact extends EntityInterface {
- production_id: string;
- gender: string;
- firstname: string;
- lastname: string;
- email: string;
- phone_no: string;
- mobile_no: string;
- fax_no: string;
- department: string;
- date_of_birth: string;
- comment: string;
- street: string;
- street_no: string;
- zip: string;
- city: string;
- country_id: number;
- is_xmas_mail_recipient: boolean;
-}
diff --git a/httpdocs/plp-angular/src/app/model/entities/production-meeting-participant.ts b/httpdocs/plp-angular/src/app/model/entities/production-meeting-participant.ts
deleted file mode 100644
index 8a05195..0000000
--- a/httpdocs/plp-angular/src/app/model/entities/production-meeting-participant.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import {EntityInterface} from '../interface/entity-interface';
-
-export interface IProductionMeetingParticipant extends EntityInterface {
- production_meeting_id: number;
- participant_user_id: number;
-}
diff --git a/httpdocs/plp-angular/src/app/model/entities/production-meeting.ts b/httpdocs/plp-angular/src/app/model/entities/production-meeting.ts
deleted file mode 100644
index 1867a5c..0000000
--- a/httpdocs/plp-angular/src/app/model/entities/production-meeting.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import {EntityInterface} from '../interface/entity-interface';
-import {IProductionMeetingParticipant} from './production-meeting-participant';
-
-export interface IProductionMeeting extends EntityInterface {
- production_id: number;
- creation_user_id: number;
- owner_user_id: number;
- meeting_type_id: number;
- title: string;
- description: string;
- start_date: string;
- end_date: string;
- production_contact_id: number;
- gender: string;
- firstname: string;
- lastname: string;
- email: string;
- phone_no: string;
- mobile_no: string;
- department: string;
- street: string;
- street_no: string;
- zip: string;
- city: string;
- country_id: number;
- report: string;
- first_reminder_sent: boolean;
- second_reminder_sent: boolean;
- report_reminder_sent: boolean;
- creation_date: string;
- v_participants: IProductionMeetingParticipant[];
- v_is_editable: boolean;
-}
diff --git a/httpdocs/plp-angular/src/app/model/entities/production-note.ts b/httpdocs/plp-angular/src/app/model/entities/production-note.ts
deleted file mode 100644
index 30a234c..0000000
--- a/httpdocs/plp-angular/src/app/model/entities/production-note.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import {EntityInterface} from '../interface/entity-interface';
-
-export interface IProductionNote extends EntityInterface {
- production_id: number;
- production_contact_id: number;
- user_id: number;
- gender: string;
- firstname: string;
- lastname: string;
- email: string;
- phone_no: string;
- mobile_no: string;
- fax_no: string;
- department: string;
- title: string;
- comment: string;
- note_date: string;
- creation_date: string;
- creation_user_id: number;
- creation_user_firstname: string;
- creation_user_lastname: string;
-}
diff --git a/httpdocs/plp-angular/src/app/model/entities/production.ts b/httpdocs/plp-angular/src/app/model/entities/production.ts
deleted file mode 100644
index b255445..0000000
--- a/httpdocs/plp-angular/src/app/model/entities/production.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import {EntityInterface} from '../interface/entity-interface';
-import {IProductionContact} from './production-contact';
-import {IProductionNote} from './production-note';
-import {IProductionMeeting} from './production-meeting';
-
-export interface IProduction extends EntityInterface {
- old_plp_id: string;
- name: string;
- name_additional: string;
- street: string;
- street_no: string;
- zip: string;
- city: string;
- country_id: number;
- url: string;
- email: string;
- phone_no: string;
- mobile_no: string;
- fax_no: string;
- comment: string;
- tax_no: string;
- invoice_mode: string;
- invoice_comment: string;
- invoice_key: string;
- active: boolean;
- v_production_contacts: IProductionContact[];
- v_production_notes: IProductionNote[];
- v_production_meetings: IProductionMeeting[];
-}
diff --git a/httpdocs/plp-angular/src/app/model/entities/service-contact.ts b/httpdocs/plp-angular/src/app/model/entities/service-contact.ts
deleted file mode 100644
index 2ce6eb8..0000000
--- a/httpdocs/plp-angular/src/app/model/entities/service-contact.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import {EntityInterface} from '../interface/entity-interface';
-
-export interface IServiceContact extends EntityInterface {
- service_id: string;
- gender: string;
- firstname: string;
- lastname: string;
- email: string;
- phone_no: string;
- mobile_no: string;
- fax_no: string;
- department: string;
- date_of_birth: string;
- comment: string;
- street: string;
- street_no: string;
- zip: string;
- city: string;
- country_id: number;
- is_xmas_mail_recipient: boolean;
-}
diff --git a/httpdocs/plp-angular/src/app/model/entities/service-meeting-participant.ts b/httpdocs/plp-angular/src/app/model/entities/service-meeting-participant.ts
deleted file mode 100644
index c2aa999..0000000
--- a/httpdocs/plp-angular/src/app/model/entities/service-meeting-participant.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import {EntityInterface} from '../interface/entity-interface';
-
-export interface IServiceMeetingParticipant extends EntityInterface {
- service_meeting_id: number;
- participant_user_id: number;
-}
diff --git a/httpdocs/plp-angular/src/app/model/entities/service-meeting.ts b/httpdocs/plp-angular/src/app/model/entities/service-meeting.ts
deleted file mode 100644
index f1b44d0..0000000
--- a/httpdocs/plp-angular/src/app/model/entities/service-meeting.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import {EntityInterface} from '../interface/entity-interface';
-import {IServiceMeetingParticipant} from './service-meeting-participant';
-
-export interface IServiceMeeting extends EntityInterface {
- service_id: number;
- creation_user_id: number;
- owner_user_id: number;
- meeting_type_id: number;
- title: string;
- description: string;
- start_date: string;
- end_date: string;
- service_contact_id: number;
- gender: string;
- firstname: string;
- lastname: string;
- email: string;
- phone_no: string;
- mobile_no: string;
- department: string;
- street: string;
- street_no: string;
- zip: string;
- city: string;
- country_id: number;
- report: string;
- first_reminder_sent: boolean;
- second_reminder_sent: boolean;
- report_reminder_sent: boolean;
- creation_date: string;
- v_participants: IServiceMeetingParticipant[];
- v_is_editable: boolean;
-}
diff --git a/httpdocs/plp-angular/src/app/model/entities/service-note.ts b/httpdocs/plp-angular/src/app/model/entities/service-note.ts
deleted file mode 100644
index 8562c6d..0000000
--- a/httpdocs/plp-angular/src/app/model/entities/service-note.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import {EntityInterface} from '../interface/entity-interface';
-
-export interface IServiceNote extends EntityInterface {
- service_id: number;
- service_contact_id: number;
- user_id: number;
- gender: string;
- firstname: string;
- lastname: string;
- email: string;
- phone_no: string;
- mobile_no: string;
- fax_no: string;
- department: string;
- title: string;
- comment: string;
- note_date: string;
- creation_date: string;
- creation_user_id: number;
- creation_user_firstname: string;
- creation_user_lastname: string;
-}
diff --git a/httpdocs/plp-angular/src/app/model/entities/service.ts b/httpdocs/plp-angular/src/app/model/entities/service.ts
deleted file mode 100644
index 871b83b..0000000
--- a/httpdocs/plp-angular/src/app/model/entities/service.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import {EntityInterface} from '../interface/entity-interface';
-import {IServiceContact} from './service-contact';
-import {IServiceNote} from './service-note';
-import {IServiceMeeting} from './service-meeting';
-
-export interface IService extends EntityInterface {
- old_plp_id: string;
- name: string;
- name_additional: string;
- street: string;
- street_no: string;
- zip: string;
- city: string;
- country_id: number;
- url: string;
- email: string;
- phone_no: string;
- mobile_no: string;
- fax_no: string;
- comment: string;
- tax_no: string;
- invoice_mode: string;
- invoice_comment: string;
- invoice_key: string;
- active: boolean;
- v_service_contacts: IServiceContact[];
- v_service_notes: IServiceNote[];
- v_service_meetings: IServiceMeeting[];
-}
diff --git a/httpdocs/plp-angular/src/app/model/interface/meeting-interface.ts b/httpdocs/plp-angular/src/app/model/interface/meeting-interface.ts
new file mode 100644
index 0000000..ba6cfb9
--- /dev/null
+++ b/httpdocs/plp-angular/src/app/model/interface/meeting-interface.ts
@@ -0,0 +1,13 @@
+export interface MeetingInterface {
+ creation_user_id: number;
+ owner_user_id: number;
+ title: string;
+ description: string;
+ start_date: string;
+ end_date: string;
+ report: string;
+ first_reminder_sent: boolean;
+ second_reminder_sent: boolean;
+ report_reminder_sent: boolean;
+ creation_date: string;
+}
\ No newline at end of file
diff --git a/httpdocs/plp-angular/src/app/model/virtual/meeting-data.ts b/httpdocs/plp-angular/src/app/model/virtual/meeting-data.ts
index 3c9f121..035749b 100644
--- a/httpdocs/plp-angular/src/app/model/virtual/meeting-data.ts
+++ b/httpdocs/plp-angular/src/app/model/virtual/meeting-data.ts
@@ -1,13 +1,7 @@
import {ICustomerMeeting} from '../entities/customer-meeting';
import {IInternalMeeting} from '../entities/internal-meeting';
-import {IOperatorMeeting} from '../entities/operator-meeting';
-import {IProductionMeeting} from '../entities/production-meeting';
-import {IServiceMeeting} from '../entities/service-meeting';
export interface IMeetingData {
customerMeetings: ICustomerMeeting[];
internalMeetings: IInternalMeeting[];
- operatorMeetings: IOperatorMeeting[];
- productionMeetings: IProductionMeeting[];
- serviceMeetings: IServiceMeeting[];
}
diff --git a/httpdocs/plp-angular/src/app/model/virtual/operator-data.ts b/httpdocs/plp-angular/src/app/model/virtual/operator-data.ts
deleted file mode 100644
index 7c0e24e..0000000
--- a/httpdocs/plp-angular/src/app/model/virtual/operator-data.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import {IOperator} from '../entities/operator';
-import {IOperatorContact} from '../entities/operator-contact';
-import {IOperatorMeeting} from '../entities/operator-meeting';
-
-export interface IOperatorData {
- operators: IOperator[];
- operatorContacts: IOperatorContact[];
- operatorMeetings: IOperatorMeeting[];
-}
diff --git a/httpdocs/plp-angular/src/app/model/virtual/production-data.ts b/httpdocs/plp-angular/src/app/model/virtual/production-data.ts
deleted file mode 100644
index 7e89aba..0000000
--- a/httpdocs/plp-angular/src/app/model/virtual/production-data.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import {IProduction} from '../entities/production';
-import {IProductionContact} from '../entities/production-contact';
-import {IProductionMeeting} from '../entities/production-meeting';
-
-export interface IProductionData {
- productions: IProduction[];
- productionContacts: IProductionContact[];
- productionMeetings: IProductionMeeting[];
-}
diff --git a/httpdocs/plp-angular/src/app/model/virtual/service-data.ts b/httpdocs/plp-angular/src/app/model/virtual/service-data.ts
deleted file mode 100644
index 62888b1..0000000
--- a/httpdocs/plp-angular/src/app/model/virtual/service-data.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import {IService} from '../entities/service';
-import {IServiceContact} from '../entities/service-contact';
-import {IServiceMeeting} from '../entities/service-meeting';
-
-export interface IServiceData {
- services: IService[];
- serviceContacts: IServiceContact[];
- serviceMeetings: IServiceMeeting[];
-}
diff --git a/httpdocs/plp-angular/src/app/services/customer.service.ts b/httpdocs/plp-angular/src/app/services/customer.service.ts
index 16f0b3a..74d8fb4 100644
--- a/httpdocs/plp-angular/src/app/services/customer.service.ts
+++ b/httpdocs/plp-angular/src/app/services/customer.service.ts
@@ -37,24 +37,23 @@ export class CustomerService {
/**
* Handles service data updates
- * @param {IAppServiceData} serviceData
*/
public handleServiceData(serviceData: IAppServiceData = null): void {
- if (!null === serviceData) { } } {) {
- const bSetNewData = false;
- const updatedCustomers: ICustomer[] = this.customers.getValue();
- const updatedCustomerContacts: ICustomerContact[] = this.customerContacts.getValue();
- if (!null === serviceData.customers) { } } {) {
+ if (null !== serviceData) {
+ let bSetNewData = false;
+ let updatedCustomers: ICustomer[] = this.customers.getValue();
+ let updatedCustomerContacts: ICustomerContact[] = this.customerContacts.getValue();
+ if (null !== serviceData.customers) {
// Update service data
updatedCustomers = ServiceHelper.updateServiceEntries(serviceData.customers, this.customers.getValue()) as ICustomer[];
bSetNewData = true;
}
- if (!null === serviceData.customerContacts) { } } {) {
+ if (null !== serviceData.customerContacts) {
// Update service data
updatedCustomerContacts = ServiceHelper.updateServiceEntries(serviceData.customerContacts, this.customerContacts.getValue()) as ICustomerContact[];
bSetNewData = true;
}
- if (bSetNewData) {
+ if (bSetNewData) {
this.setCustomerServiceData(updatedCustomers, updatedCustomerContacts);
}
}
@@ -62,10 +61,8 @@ export class CustomerService {
/**
* Sets customer service and cache data
- * @param customers
- * @param customerContacts
*/
- private setCustomerServiceData(customers: ICustomer[], customerContacts: ICustomerContact[]); {
+ private setCustomerServiceData(customers: ICustomer[], customerContacts: ICustomerContact[]) {
this.customers.next(customers);
this.customerContacts.next(customerContacts);
}
@@ -73,34 +70,29 @@ export class CustomerService {
/**
* Reset service data (on logout)
*/
- public resetCustomerServiceData(); {
+ public resetCustomerServiceData() {
this.customers.next(null);
this.customerContacts.next(null);
}
/**
* Returns observable of customers
- * @returns {Observable
}
*/
- public getCustomers$(); : Observable < ICustomer[] > {
+ public getCustomers$(): Observable {
return this.dataCustomers$;
};
/**
* Returns observable of customer contacts
- * @returns {Observable}
*/
- public getCustomerContacts$(); : Observable < ICustomerContact[] > {
+ public getCustomerContacts$(): Observable {
return this.dataCustomerContacts$;
- };
-
-
+ }
/**
* Gets all customers
- * @returns {Observable}
*/
- public apiGetCustomerData(); : void {
+ public apiGetCustomerData(): void {
this.httpService.apiGet('get-customer-data').subscribe(
data => {
const res: ICustomerData = data.result_data as ICustomerData;
@@ -108,114 +100,96 @@ export class CustomerService {
},
error => {}
);
- };
+ }
/**
* Returns full customer
- * @param {number} customerId
- * @returns {Observable}
*/
- public apiGetCustomerFull(customerId: number); : Observable < IApiResponse > {
+ public apiGetCustomerFull(customerId: number): Observable {
const formData = new FormData();
formData.append('customerId', JSON.stringify(customerId));
return this.httpService.apiPost('get-customer-full', formData);
- };
+ }
/**
* Create customer
- * @param {ICustomer} customer
- * @returns {Observable}
*/
- public apiCreateCustomer(customer: ICustomer); : Observable < IApiResponse > {
+ public apiCreateCustomer(customer: ICustomer): Observable {
const formData = new FormData();
formData.append('customer', JSON.stringify(customer));
return this.httpService.apiPost('create-customer', formData);
- };
+ }
/**
* Edit customer
- * @param {ICustomer} customer
- * @returns {Observable}
*/
- public apiEditCustomer(customer: ICustomer); : Observable < IApiResponse > {
+ public apiEditCustomer(customer: ICustomer): Observable {
const formData = new FormData();
formData.append('customer', JSON.stringify(customer));
return this.httpService.apiPost('edit-customer', formData);
- };
+ }
/**
* Create customer contact
- * @param customerContact
*/
- public apiCreateCustomerContact(customerContact: ICustomerContact); : Observable < IApiResponse > {
+ public apiCreateCustomerContact(customerContact: ICustomerContact): Observable {
const formData = new FormData();
formData.append('customerContact', JSON.stringify(customerContact));
return this.httpService.apiPost('create-customer-contact', formData);
- };
+ }
/**
* Edit customer contact
- * @param {ICustomerContact} customerContact
- * @returns {Observable}
*/
- public apiEditCustomerContact(customerContact: ICustomerContact); : Observable < IApiResponse > {
+ public apiEditCustomerContact(customerContact: ICustomerContact): Observable {
const formData = new FormData();
formData.append('customerContact', JSON.stringify(customerContact));
return this.httpService.apiPost('edit-customer-contact', formData);
- };
+ }
/**
* Delete customer contact
- * @param {number} customerContactId
- * @returns {Observable}
*/
- public apiDeleteCustomerContact(customerContactId: number); : Observable < IApiResponse > {
+ public apiDeleteCustomerContact(customerContactId: number): Observable {
const formData = new FormData();
formData.append('customerContactId', JSON.stringify(customerContactId));
return this.httpService.apiPost('delete-customer-contact', formData);
- };
+ }
/**
* Create customer note
- * @param {ICustomerNote} customerNote
- * @returns {Observable}
*/
- public apiCreateCustomerNote(customerNote: ICustomerNote); : Observable < IApiResponse > {
+ public apiCreateCustomerNote(customerNote: ICustomerNote): Observable {
const formData = new FormData();
formData.append('customerNote', JSON.stringify(customerNote));
return this.httpService.apiPost('create-customer-note', formData);
- };
+ }
/**
* Edit customer note
- * @param {ICustomerNote} customerNote
- * @returns {Observable}
*/
- public apiEditCustomerNote(customerNote: ICustomerNote); : Observable < IApiResponse > {
+ public apiEditCustomerNote(customerNote: ICustomerNote): Observable {
const formData = new FormData();
formData.append('customerNote', JSON.stringify(customerNote));
return this.httpService.apiPost('edit-customer-note', formData);
- };
+ }
/**
* Delete customer note
- * @param {number} customerNoteId
- * @returns {Observable}
*/
- public apiDeleteCustomerNote(customerNoteId: number); : Observable < IApiResponse > {
+ public apiDeleteCustomerNote(customerNoteId: number): Observable {
const formData = new FormData();
formData.append('customerNoteId', JSON.stringify(customerNoteId));
return this.httpService.apiPost('delete-customer-note', formData);
- };
+ }
/**
* Edit customer meeting report
- * @param customerMeetingId
*/
- public apiEditCustomerMeetingReport(customerMeetingId: number, customerMeetingReport: string); : Observable < IApiResponse > {
+ public apiEditCustomerMeetingReport(customerMeetingId: number, customerMeetingReport: string): Observable {
const formData = new FormData();
formData.append('customerMeetingId', JSON.stringify(customerMeetingId));
formData.append('customerMeetingReport', JSON.stringify(customerMeetingReport));
return this.httpService.apiPost('edit-customer-meeting-report', formData);
- };
+ }
}
diff --git a/httpdocs/plp-angular/src/app/services/http.service.ts b/httpdocs/plp-angular/src/app/services/http.service.ts
index 88aae5b..7ec439c 100644
--- a/httpdocs/plp-angular/src/app/services/http.service.ts
+++ b/httpdocs/plp-angular/src/app/services/http.service.ts
@@ -3,7 +3,6 @@ import {HttpClient, HttpErrorResponse} from '@angular/common/http';
import {BehaviorSubject, Observable} from 'rxjs';
import {environment} from '../../environments/environment';
import {finalize, tap} from 'rxjs/operators';
-import {isUndefined} from 'util';
import {MessageService} from './message.service';
import {IApiResponse} from '../model/virtual/api-response';
import {CacheService} from './cache.service';
@@ -15,9 +14,6 @@ export class HttpService {
/**
* Constructor
- * @param {HttpClient} httpClient
- * @param {MessageService} messageService
- * @param {RendererFactory2} rendererFactory
*/
constructor(private httpClient: HttpClient, private messageService: MessageService, private rendererFactory: RendererFactory2) {
this.renderer = this.rendererFactory.createRenderer(null, null);
@@ -34,7 +30,6 @@ export class HttpService {
/**
* Returns location observable
- * @returns {Observable}
*/
public getServiceData$(): Observable {
return this.dataServiceData$;
@@ -42,32 +37,29 @@ export class HttpService {
/**
* Processes optional cache service data delivered by call
- * @param data
*/
private checkMessages(data: IApiResponse): void {
// Show optional success message
- if (!isUndefined(data.success_code) && null !== data.success_code && data.success_code !== 0) {
+ if (undefined !== data.success_code && null !== data.success_code && data.success_code !== 0) {
this.messageService.setSuccess(data.success_code, data.success_msg);
}
// Show optional info message
- if (!isUndefined(data.info_code) && null !== data.info_code && data.info_code !== 0) {
+ if (undefined !== data.info_code && null !== data.info_code && data.info_code !== 0) {
this.messageService.setInfoCode(data.info_code, data.info_msg);
}
// Show optional error message
- if (!isUndefined(data.error_code) && null !== data.error_code && data.error_code !== 0) {
+ if (undefined !== data.error_code && null !== data.error_code && data.error_code !== 0) {
this.messageService.setError(data.error_code, data.error_msg);
}
}
/**
* Handles http error repsonse
- * @param {HttpErrorResponse} error
- * @param {boolean} serviceDataCheck
*/
private handleError(error: HttpErrorResponse, serviceDataCheck: boolean): void {
- if (error.status == HttpService.AUTHENTICATION_ERROR_CODE) {
+ if (error.status === HttpService.AUTHENTICATION_ERROR_CODE) {
this.messageService.setError(HttpService.AUTHENTICATION_ERROR_CODE, HttpService.AUTHENTICATION_ERROR_MESSAGE);
} else {
const response: IApiResponse = error.error as IApiResponse;
@@ -80,7 +72,6 @@ export class HttpService {
/**
* Toggles loader icon
- * @param show
*/
public showLoader(show: boolean): void {
show ?
@@ -89,12 +80,7 @@ export class HttpService {
}
/**
- *
- * @param {string} urlResource
- * @param {number} id
- * @param {boolean} serviceDataCheck
- * @param {boolean} loaderIcon
- * @returns {Observable}
+ * Api get call
*/
public apiGet(urlResource: string, id: number = null, serviceDataCheck: boolean = true, loaderIcon: boolean = true): Observable {
this.showLoader(true);
@@ -122,11 +108,6 @@ export class HttpService {
/**
* Post api call
- * @param {string} urlResource
- * @param {FormData} formData
- * @param {boolean} serviceDataCheck
- * @param {boolean} withLoaderIcon
- * @returns {Observable}
*/
public apiPost(urlResource: string, formData: FormData, serviceDataCheck: boolean = true, withLoaderIcon: boolean = true): Observable {
if (withLoaderIcon) {
@@ -159,9 +140,6 @@ export class HttpService {
/**
* Post call for excel files
- * @param {string} urlResource
- * @param {FormData} formData
- * @returns {Observable}
*/
public apiFilePost(urlResource: string, formData: FormData): Observable {
this.showLoader(true);
diff --git a/httpdocs/plp-angular/src/app/services/meeting.service.ts b/httpdocs/plp-angular/src/app/services/meeting.service.ts
index 773253f..15fbbd3 100644
--- a/httpdocs/plp-angular/src/app/services/meeting.service.ts
+++ b/httpdocs/plp-angular/src/app/services/meeting.service.ts
@@ -7,13 +7,9 @@ import {IApiResponse} from '../model/virtual/api-response';
import {IAppServiceData} from '../model/virtual/app-service-data';
import {saveAs} from 'file-saver';
import {ServiceHelper} from '../utils/service-helper';
-import {ICustomerNote} from '../model/entities/customer-note';
import {ICustomerMeeting} from '../model/entities/customer-meeting';
import {IInternalMeeting} from '../model/entities/internal-meeting';
import {IMeetingData} from '../model/virtual/meeting-data';
-import {IOperatorMeeting} from '../model/entities/operator-meeting';
-import {IProductionMeeting} from '../model/entities/production-meeting';
-import {IServiceMeeting} from '../model/entities/service-meeting';
@Injectable()
export class MeetingService {
@@ -22,12 +18,6 @@ export class MeetingService {
private customerMeetings$: Observable;
private internalMeetings: BehaviorSubject;
private internalMeetings$: Observable;
- private operatorMeetings: BehaviorSubject;
- private operatorMeetings$: Observable;
- private productionMeetings: BehaviorSubject;
- private productionMeetings$: Observable;
- private serviceMeetings: BehaviorSubject;
- private serviceMeetings$: Observable;
private meetingData: BehaviorSubject;
private meetingData$: Observable;
private serviceDataSub: Subscription;
@@ -37,12 +27,6 @@ export class MeetingService {
this.customerMeetings$ = this.customerMeetings.asObservable();
this.internalMeetings = new BehaviorSubject(null);
this.internalMeetings$ = this.internalMeetings.asObservable();
- this.operatorMeetings = new BehaviorSubject(null);
- this.operatorMeetings$ = this.operatorMeetings.asObservable();
- this.productionMeetings = new BehaviorSubject(null);
- this.productionMeetings$ = this.productionMeetings.asObservable();
- this.serviceMeetings = new BehaviorSubject(null);
- this.serviceMeetings$ = this.serviceMeetings.asObservable();
this.meetingData = new BehaviorSubject(null);
this.meetingData$ = this.meetingData.asObservable();
@@ -58,48 +42,27 @@ export class MeetingService {
/**
* Handles service data updates
- * @param {IAppServiceData} serviceData
*/
public handleServiceData(serviceData: IAppServiceData = null): void {
- if (!null === serviceData) { } } {) {
- const bSetNewData = false;
- const updatedCustomerMeetings: ICustomerMeeting[] = this.customerMeetings.getValue();
- const updatedInternalMeetings: IInternalMeeting[] = this.internalMeetings.getValue();
- const updatedOperatorMeetings: IOperatorMeeting[] = this.operatorMeetings.getValue();
- const updatedProductionMeetings: IProductionMeeting[] = this.productionMeetings.getValue();
- const updatedServiceMeetings: IServiceMeeting[] = this.serviceMeetings.getValue();
- if (!null === serviceData.customerMeetings) { } } {) {
+ if (null !== serviceData) {
+ let bSetNewData = false;
+ let updatedCustomerMeetings: ICustomerMeeting[] = this.customerMeetings.getValue();
+ let updatedInternalMeetings: IInternalMeeting[] = this.internalMeetings.getValue();
+ if (null !== serviceData.customerMeetings) {
// Update service data
updatedCustomerMeetings = ServiceHelper.updateServiceEntries(serviceData.customerMeetings, this.customerMeetings.getValue()) as ICustomerMeeting[];
bSetNewData = true;
}
- if (!null === serviceData.internalMeetings) { } } {) {
+ if (null !== serviceData.internalMeetings) {
// Update service data
updatedInternalMeetings = ServiceHelper.updateServiceEntries(serviceData.internalMeetings, this.internalMeetings.getValue()) as IInternalMeeting[];
bSetNewData = true;
}
- if (!null === serviceData.operatorMeetings) { } } {) {
- // Update service data
- updatedOperatorMeetings = ServiceHelper.updateServiceEntries(serviceData.operatorMeetings, this.operatorMeetings.getValue()) as IOperatorMeeting[];
- bSetNewData = true;
- }
- if (!null === serviceData.productionMeetings) { } } {) {
- // Update service data
- updatedProductionMeetings = ServiceHelper.updateServiceEntries(serviceData.productionMeetings, this.productionMeetings.getValue()) as IProductionMeeting[];
- bSetNewData = true;
- }
- if (!null === serviceData.operatorMeetings) { } } {) {
- // Update service data
- updatedServiceMeetings = ServiceHelper.updateServiceEntries(serviceData.serviceMeetings, this.serviceMeetings.getValue()) as IServiceMeeting[];
- bSetNewData = true;
- }
- if (bSetNewData) {
+
+ if (bSetNewData) {
const meetingData: {} = {
customerMeetings: updatedCustomerMeetings,
internalMeetings: updatedInternalMeetings,
- operatorMeetings: updatedOperatorMeetings,
- productionMeetings: updatedProductionMeetings,
- serviceMeetings: updatedServiceMeetings,
};
this.setMeetingServiceData(meetingData as IMeetingData);
}
@@ -108,58 +71,38 @@ export class MeetingService {
/**
* Sets customer service and cache data
- * @param meetingData
*/
- private setMeetingServiceData(meetingData: IMeetingData); {
+ private setMeetingServiceData(meetingData: IMeetingData) {
this.meetingData.next(meetingData);
this.customerMeetings.next(meetingData.customerMeetings);
this.internalMeetings.next(meetingData.internalMeetings);
- this.operatorMeetings.next(meetingData.operatorMeetings);
- this.productionMeetings.next(meetingData.productionMeetings);
- this.serviceMeetings.next(meetingData.serviceMeetings);
}
/**
* Reset service data (on logout)
*/
- public resetMeetingServiceData(); {
+ public resetMeetingServiceData() {
this.meetingData.next(null);
this.customerMeetings.next(null);
this.internalMeetings.next(null);
- this.operatorMeetings.next(null);
- this.productionMeetings.next(null);
- this.serviceMeetings.next(null);
}
- public getMeetingsData$(); : Observable < IMeetingData > {
+ public getMeetingsData$(): Observable {
return this.meetingData$;
- };
+ }
- public getCustomerMeetings$(); : Observable < ICustomerMeeting[] > {
+ public getCustomerMeetings$(): Observable {
return this.customerMeetings$;
- };
+ }
- public getInternalMeetings$(); : Observable < IInternalMeeting[] > {
+ public getInternalMeetings$(): Observable {
return this.internalMeetings$;
- };
-
- public getOperatorMeetings$(); : Observable < IOperatorMeeting[] > {
- return this.operatorMeetings$;
- };
-
- public getProductionMeetings$(); : Observable < IProductionMeeting[] > {
- return this.productionMeetings$;
- };
-
- public getServiceMeetings$(); : Observable < IServiceMeeting[] > {
- return this.serviceMeetings$;
- };
+ }
/**
- * Gets all customers
- * @returns {Observable}
+ * Gets meeting data
*/
- public apiGetMeetingData(); : void {
+ public apiGetMeetingData(): void {
this.httpService.apiGet('get-meeting-data').subscribe(
data => {
const res: IMeetingData = data.result_data as IMeetingData;
@@ -167,280 +110,104 @@ export class MeetingService {
},
error => {}
);
- };
+ }
/**
* Create customer meeting
- * @param {ICustomerNote} customerMeeting
- * @returns {Observable}
*/
- public apiCreateCustomerMeeting(customerMeeting: ICustomerMeeting); : Observable < IApiResponse > {
+ public apiCreateCustomerMeeting(customerMeeting: ICustomerMeeting): Observable {
const formData = new FormData();
formData.append('customerMeeting', JSON.stringify(customerMeeting));
return this.httpService.apiPost('create-customer-meeting', formData);
- };
+ }
/**
* Edit customer meeting
- * @param {ICustomerNote} customerMeeting
- * @returns {Observable}
*/
- public apiEditCustomerMeeting(customerMeeting: ICustomerMeeting); : Observable < IApiResponse > {
+ public apiEditCustomerMeeting(customerMeeting: ICustomerMeeting): Observable {
const formData = new FormData();
formData.append('customerMeeting', JSON.stringify(customerMeeting));
return this.httpService.apiPost('edit-customer-meeting', formData);
- };
+ }
/**
* Delete customer meeting
- * @param {number} customerMeetingId
- * @returns {Observable}
*/
- public apiDeleteCustomerMeeting(customerMeetingId: number); : Observable < IApiResponse > {
+ public apiDeleteCustomerMeeting(customerMeetingId: number): Observable {
const formData = new FormData();
formData.append('customerMeetingId', JSON.stringify(customerMeetingId));
return this.httpService.apiPost('delete-customer-meeting', formData);
- };
+ }
/**
* Checks customer meeting report
- * @param customerMeetingId
*/
- public apiCheckCustomerMeetingReport(customerMeetingId: number); : Observable < IApiResponse > {
+ public apiCheckCustomerMeetingReport(customerMeetingId: number): Observable {
const formData = new FormData();
formData.append('customerMeetingId', JSON.stringify(customerMeetingId));
return this.httpService.apiPost('check-customer-meeting-report', formData, true);
- };
+ }
/**
* Edit customer meeting report
- * @param customerMeetingId
- * @param customerMeetingReport
*/
- public apiEditCustomerMeetingReport(customerMeetingId: number, customerMeetingReport: string); : Observable < IApiResponse > {
+ public apiEditCustomerMeetingReport(customerMeetingId: number, customerMeetingReport: string): Observable {
const formData = new FormData();
formData.append('customerMeetingId', JSON.stringify(customerMeetingId));
formData.append('customerMeetingReport', JSON.stringify(customerMeetingReport));
return this.httpService.apiPost('edit-customer-meeting-report', formData);
- };
+ }
/**
* Create internal meeting
- * @param internalMeeting
*/
- public apiCreateInternalMeeting(internalMeeting: IInternalMeeting); : Observable < IApiResponse > {
+ public apiCreateInternalMeeting(internalMeeting: IInternalMeeting): Observable {
const formData = new FormData();
formData.append('internalMeeting', JSON.stringify(internalMeeting));
return this.httpService.apiPost('create-internal-meeting', formData);
- };
+ }
/**
* Edit internal meeting
- * @param internalMeeting
*/
- public apiEditInternalMeeting(internalMeeting: IInternalMeeting); : Observable < IApiResponse > {
+ public apiEditInternalMeeting(internalMeeting: IInternalMeeting): Observable {
const formData = new FormData();
formData.append('internalMeeting', JSON.stringify(internalMeeting));
return this.httpService.apiPost('edit-internal-meeting', formData);
- };
+ }
/**
* Delete internal meeting
- * @param internalMeetingId
*/
- public apiDeleteInternalMeeting(internalMeetingId: number); : Observable < IApiResponse > {
+ public apiDeleteInternalMeeting(internalMeetingId: number): Observable {
const formData = new FormData();
formData.append('internalMeetingId', JSON.stringify(internalMeetingId));
return this.httpService.apiPost('delete-internal-meeting', formData);
- };
+ }
/**
* Checks internal meeting report
- * @param internalMeetingId
*/
- public apiCheckInternalMeetingReport(internalMeetingId: number); : Observable < IApiResponse > {
+ public apiCheckInternalMeetingReport(internalMeetingId: number): Observable {
const formData = new FormData();
formData.append('internalMeetingId', JSON.stringify(internalMeetingId));
return this.httpService.apiPost('check-internal-meeting-report', formData, false);
- };
+ }
/**
* Edit internal meeting report
- * @param internalMeetingId
- * @param internalMeetingReport
*/
- public apiEditInternalMeetingReport(internalMeetingId: number, internalMeetingReport: string); : Observable < IApiResponse > {
+ public apiEditInternalMeetingReport(internalMeetingId: number, internalMeetingReport: string): Observable {
const formData = new FormData();
formData.append('internalMeetingId', JSON.stringify(internalMeetingId));
formData.append('internalMeetingReport', JSON.stringify(internalMeetingReport));
return this.httpService.apiPost('edit-internal-meeting-report', formData);
- };
-
- /**
- * Create operator meeting
- * @param operatorMeeting
- */
- public apiCreateOperatorMeeting(operatorMeeting: IOperatorMeeting); : Observable < IApiResponse > {
- const formData = new FormData();
- formData.append('operatorMeeting', JSON.stringify(operatorMeeting));
- return this.httpService.apiPost('create-operator-meeting', formData);
- };
-
- /**
- * Edit operator meeting
- * @param operatorMeeting
- */
- public apiEditOperatorMeeting(operatorMeeting: IOperatorMeeting); : Observable < IApiResponse > {
- const formData = new FormData();
- formData.append('operatorMeeting', JSON.stringify(operatorMeeting));
- return this.httpService.apiPost('edit-operator-meeting', formData);
- };
-
- /**
- * Delete operator meeting
- * @param {number} operatorMeetingId
- * @returns {Observable}
- */
- public apiDeleteOperatorMeeting(operatorMeetingId: number); : Observable < IApiResponse > {
- const formData = new FormData();
- formData.append('operatorMeetingId', JSON.stringify(operatorMeetingId));
- return this.httpService.apiPost('delete-operator-meeting', formData);
- };
-
- /**
- * Checks operator meeting report
- * @param operatorMeetingId
- */
- public apiCheckOperatorMeetingReport(operatorMeetingId: number); : Observable < IApiResponse > {
- const formData = new FormData();
- formData.append('operatorMeetingId', JSON.stringify(operatorMeetingId));
- return this.httpService.apiPost('check-operator-meeting-report', formData, true);
- };
-
- /**
- * Edit operator meeting report
- * @param operatorMeetingId
- * @param operatorMeetingReport
- */
- public apiEditOperatorMeetingReport(operatorMeetingId: number, operatorMeetingReport: string); : Observable < IApiResponse > {
- const formData = new FormData();
- formData.append('operatorMeetingId', JSON.stringify(operatorMeetingId));
- formData.append('operatorMeetingReport', JSON.stringify(operatorMeetingReport));
- return this.httpService.apiPost('edit-operator-meeting-report', formData);
- };
-
- /**
- * Create production meeting
- * @param productionMeeting
- */
- public apiCreateProductionMeeting(productionMeeting: IProductionMeeting); : Observable < IApiResponse > {
- const formData = new FormData();
- formData.append('productionMeeting', JSON.stringify(productionMeeting));
- return this.httpService.apiPost('create-production-meeting', formData);
- };
-
- /**
- * Edit production meeting
- * @param productionMeeting
- */
- public apiEditProductionMeeting(productionMeeting: IProductionMeeting); : Observable < IApiResponse > {
- const formData = new FormData();
- formData.append('productionMeeting', JSON.stringify(productionMeeting));
- return this.httpService.apiPost('edit-production-meeting', formData);
- };
-
- /**
- * Delete production meeting
- * @param {number} productionMeetingId
- * @returns {Observable}
- */
- public apiDeleteProductionMeeting(productionMeetingId: number); : Observable < IApiResponse > {
- const formData = new FormData();
- formData.append('productionMeetingId', JSON.stringify(productionMeetingId));
- return this.httpService.apiPost('delete-production-meeting', formData);
- };
-
- /**
- * Checks production meeting report
- * @param productionMeetingId
- */
- public apiCheckProductionMeetingReport(productionMeetingId: number); : Observable < IApiResponse > {
- const formData = new FormData();
- formData.append('productionMeetingId', JSON.stringify(productionMeetingId));
- return this.httpService.apiPost('check-production-meeting-report', formData, true);
- };
-
- /**
- * Edit production meeting report
- * @param productionMeetingId
- * @param productionMeetingReport
- */
- public apiEditProductionMeetingReport(productionMeetingId: number, productionMeetingReport: string); : Observable < IApiResponse > {
- const formData = new FormData();
- formData.append('productionMeetingId', JSON.stringify(productionMeetingId));
- formData.append('productionMeetingReport', JSON.stringify(productionMeetingReport));
- return this.httpService.apiPost('edit-production-meeting-report', formData);
- };
-
- /**
- * Create service meeting
- * @param serviceMeeting
- */
- public apiCreateServiceMeeting(serviceMeeting: IServiceMeeting); : Observable < IApiResponse > {
- const formData = new FormData();
- formData.append('serviceMeeting', JSON.stringify(serviceMeeting));
- return this.httpService.apiPost('create-service-meeting', formData);
- };
-
- /**
- * Edit service meeting
- * @param serviceMeeting
- */
- public apiEditServiceMeeting(serviceMeeting: IServiceMeeting); : Observable < IApiResponse > {
- const formData = new FormData();
- formData.append('serviceMeeting', JSON.stringify(serviceMeeting));
- return this.httpService.apiPost('edit-service-meeting', formData);
- };
-
- /**
- * Delete service meeting
- * @param {number} serviceMeetingId
- * @returns {Observable}
- */
- public apiDeleteServiceMeeting(serviceMeetingId: number); : Observable < IApiResponse > {
- const formData = new FormData();
- formData.append('serviceMeetingId', JSON.stringify(serviceMeetingId));
- return this.httpService.apiPost('delete-service-meeting', formData);
- };
-
- /**
- * Checks production meeting report
- * @param serviceMeetingId
- */
- public apiCheckServiceMeetingReport(serviceMeetingId: number); : Observable < IApiResponse > {
- const formData = new FormData();
- formData.append('serviceMeetingId', JSON.stringify(serviceMeetingId));
- return this.httpService.apiPost('check-service-meeting-report', formData, true);
- };
-
- /**
- * Edit service meeting report
- * @param serviceMeetingId
- * @param serviceMeetingReport
- */
- public apiEditServiceMeetingReport(serviceMeetingId: number, serviceMeetingReport: string); : Observable < IApiResponse > {
- const formData = new FormData();
- formData.append('serviceMeetingId', JSON.stringify(serviceMeetingId));
- formData.append('serviceMeetingReport', JSON.stringify(serviceMeetingReport));
- return this.httpService.apiPost('edit-service-meeting-report', formData);
- };
+ }
/**
* Returns meeting list as excel
- * @param meetingList
- * @param fileName
*/
- public apiExportMeetingList(meetingList: {}[], fileName: string); : void {
+ public apiExportMeetingList(meetingList: {}[], fileName: string): void {
const formData = new FormData();
formData.append('meetingList', JSON.stringify(meetingList));
this.httpService.apiFilePost('export-meeting-list', formData).subscribe(
@@ -450,5 +217,5 @@ export class MeetingService {
error => {
}
);
- };
+ }
}
diff --git a/httpdocs/plp-angular/src/app/views/customer-management/customer-contact-list/customer-contact-list.component.html b/httpdocs/plp-angular/src/app/views/customer-management/customer-contact-list/customer-contact-list.component.html
index 3f911a5..9a83c32 100644
--- a/httpdocs/plp-angular/src/app/views/customer-management/customer-contact-list/customer-contact-list.component.html
+++ b/httpdocs/plp-angular/src/app/views/customer-management/customer-contact-list/customer-contact-list.component.html
@@ -15,15 +15,14 @@
[suppressCellSelection]="true"
[animateRows]="true"
[rowSelection]="rowSelection"
- [rowDeselection]="true"
(gridReady)="onGridReady($event)"
(rowClicked)="rowClicked($event)"
>
+
diff --git a/httpdocs/plp-angular/src/app/views/customer-management/customer-contact-list/customer-contact-list.component.ts b/httpdocs/plp-angular/src/app/views/customer-management/customer-contact-list/customer-contact-list.component.ts
index 2f54abd..0bade80 100644
--- a/httpdocs/plp-angular/src/app/views/customer-management/customer-contact-list/customer-contact-list.component.ts
+++ b/httpdocs/plp-angular/src/app/views/customer-management/customer-contact-list/customer-contact-list.component.ts
@@ -1,4 +1,4 @@
-import {Component, EventEmitter, OnInit, Output, ViewChild} from '@angular/core';
+import {Component, EventEmitter, NgModule, OnInit, Output, ViewChild} from '@angular/core';
import {AgGridComponent} from '../../../components/ag-grid-component';
import {ICustomer} from '../../../model/entities/customer';
import {ICustomerContact} from '../../../model/entities/customer-contact';
@@ -9,6 +9,7 @@ import {CustomerService} from '../../../services/customer.service';
import {Const} from '../../../utils/const';
import {AppService} from '../../../services/app.service';
import {CommonService} from '../../../services/common.service';
+import {AgGridAngular} from 'ag-grid-angular';
@Component({
selector: 'app-customer-contact-list',
@@ -79,7 +80,7 @@ export class CustomerContactListComponent extends AgGridComponent implements OnI
*/
public generateEntries(): void {
this.rowData = [];
- if (null !== this.customerContacts) { } } {) {
+ if (null !== this.customerContacts){
for (let i = 0; i < this.customerContacts.length; i++) {
this.rowData.push({
id: this.customerContacts[i].id,
@@ -102,7 +103,7 @@ export class CustomerContactListComponent extends AgGridComponent implements OnI
* Row is clicked
* @param e
*/
- public rowClicked(e: any); {
+ public rowClicked(e: any): void {
this.modalCustomerContactPersonDetailList.openModal();
this.customerContactPersonDetailList.setData(this.customersById[e.data.customer_id], Utils.deepClone(this.customerContactsById[e.data.id]) as ICustomerContact);
}
@@ -111,7 +112,7 @@ export class CustomerContactListComponent extends AgGridComponent implements OnI
* Edit customer contact
* @param customerContact
*/
- public editCustomerContactFunction(customerContact: ICustomerContact); : void {
+ public editCustomerContactFunction(customerContact: ICustomerContact): void {
this.customerService.apiEditCustomerContact(customerContact).subscribe(
data => {
this.customerContactPersonDetailList.updateData(data.result_data as ICustomer);
@@ -124,7 +125,7 @@ export class CustomerContactListComponent extends AgGridComponent implements OnI
* Delete customer contact
* @param contactId
*/
- public deleteCustomerContactFunction(contactId: number); : void {
+ public deleteCustomerContactFunction(contactId: number): void {
this.customerService.apiDeleteCustomerContact(contactId).subscribe(
data => {
this.modalCustomerContactPersonDetailList.closeModal();
@@ -137,7 +138,7 @@ export class CustomerContactListComponent extends AgGridComponent implements OnI
* Shortcut to customer detail
* @param customer
*/
- public shortcutFunction(customer: ICustomer); : void {
+ public shortcutFunction(customer: ICustomer): void {
this.modalCustomerContactPersonDetailList.closeModal();
this.shortcut.emit(customer);
};
@@ -145,14 +146,14 @@ export class CustomerContactListComponent extends AgGridComponent implements OnI
/**
* Export customer contacts pdf
*/
- public exportCustomerContactsPdf(); : void {
+ public exportCustomerContactsPdf(): void {
this.commonService.apiExportContactsPdf('Kunden_Kontakte', 'customer');
};
/**
* Export customer xmas pdf
*/
- public exportXmasPdf(); : void {
+ public exportXmasPdf(): void {
this.commonService.apiExportXmasPdf('Kunden_Weihnachten', 'customer');
};
}
diff --git a/httpdocs/plp-angular/src/app/views/customer-management/customer-list/customer-list.component.html b/httpdocs/plp-angular/src/app/views/customer-management/customer-list/customer-list.component.html
index 9e893ac..e9465c6 100644
--- a/httpdocs/plp-angular/src/app/views/customer-management/customer-list/customer-list.component.html
+++ b/httpdocs/plp-angular/src/app/views/customer-management/customer-list/customer-list.component.html
@@ -15,7 +15,6 @@
[suppressCellSelection]="true"
[animateRows]="true"
[rowSelection]="rowSelection"
- [rowDeselection]="true"
[rowClassRules]="rowClassRules"
(gridReady)="onGridReady($event)"
(rowClicked)="rowClicked($event)"
diff --git a/httpdocs/plp-angular/src/app/views/customer-management/customer-management.component.html b/httpdocs/plp-angular/src/app/views/customer-management/customer-management.component.html
index e0a764f..d80fd4e 100644
--- a/httpdocs/plp-angular/src/app/views/customer-management/customer-management.component.html
+++ b/httpdocs/plp-angular/src/app/views/customer-management/customer-management.component.html
@@ -11,7 +11,7 @@