@colijnit/transaction 255.1.37 → 255.1.39
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bundles/colijnit-transaction.umd.js +342 -76
- package/bundles/colijnit-transaction.umd.js.map +1 -1
- package/colijnit-transaction.metadata.json +1 -1
- package/esm2015/lib/component/delivery-planning/service/delivery-planning.service.js +18 -1
- package/esm2015/lib/component/delivery-planning-main/component/delivery-planning-overview/component/delivery-planning-overview-popup/delivery-planning-overview-popup.component.js +53 -33
- package/esm2015/lib/component/delivery-planning-main/component/delivery-planning-overview/component/delivery-planning-overview-tile/component/delivery-planning-overview-tile-line/delivery-planning-overview-tile-line.component.js +21 -11
- package/esm2015/lib/component/delivery-planning-main/component/delivery-planning-overview/component/delivery-planning-overview-tile/delivery-planning-overview-tile.component.js +12 -2
- package/esm2015/lib/component/delivery-planning-main/component/delivery-planning-overview/component/delivery-planning-overview-tile-settings-popup/delivery-planning-overview-tile-settings-popup.component.js +53 -3
- package/esm2015/lib/component/delivery-planning-main/component/delivery-planning-overview/delivery-planning-overview.component.js +79 -24
- package/esm2015/lib/component/transaction/transaction.component.js +4 -1
- package/esm2015/lib/component/transaction-card/transaction-card-planning/transaction-card-planning.component.js +33 -4
- package/esm2015/lib/component/transaction-header/transaction-header-order/transaction-header-order.component.js +2 -2
- package/esm2015/lib/component/transaction-header/transaction-header-payment/transaction-header-payment.component.js +2 -2
- package/esm2015/lib/component/transaction-internal/transaction-internal.component.js +7 -4
- package/esm2015/lib/component/transaction-line/transaction-planning-line/transaction-planning-line.component.js +2 -1
- package/esm2015/lib/component/transaction-line-side-panel-planning/transaction-line-side-panel-planning.component.js +2 -2
- package/esm2015/lib/component/transaction-line-side-panel-sales/transaction-line-side-panel-sales-reservation/transaction-line-side-panel-sales-reservation/transaction-line-side-panel-sales-reservation.component.js +21 -8
- package/esm2015/lib/component/transaction-line-side-panel-sales/transaction-line-side-panel-sales.module.js +3 -2
- package/esm2015/lib/component/transaction-lines-side-panel/transaction-lines-side-panel-service-order/transaction-lines-side-panel-service-order.component.js +59 -46
- package/esm2015/lib/component/transaction-search/transaction-search-result/transaction-search-result.component.js +2 -1
- package/esm2015/lib/component/transaction-search/transaction-search-tile/transaction-purchase-reservation-order-tile/transaction-purchase-reservation-order-tile.component.js +4 -14
- package/esm2015/lib/component/transaction-service-overview/components/transaction-service-message.component.js +1 -2
- package/esm2015/lib/component/transaction-service-overview/transaction-service-overview.component.js +3 -3
- package/esm2015/lib/enum/icon.enum.js +9 -1
- package/esm2015/lib/model/icon-svg.js +9 -1
- package/esm2015/lib/transaction-version.js +3 -3
- package/fesm2015/colijnit-transaction.js +361 -146
- package/fesm2015/colijnit-transaction.js.map +1 -1
- package/lib/component/delivery-planning/service/delivery-planning.service.d.ts +4 -0
- package/lib/component/delivery-planning/style/_layout.scss +22 -1
- package/lib/component/delivery-planning-main/component/delivery-planning-overview/component/delivery-planning-overview-popup/delivery-planning-overview-popup.component.d.ts +9 -6
- package/lib/component/delivery-planning-main/component/delivery-planning-overview/component/delivery-planning-overview-tile/component/delivery-planning-overview-tile-line/delivery-planning-overview-tile-line.component.d.ts +3 -0
- package/lib/component/delivery-planning-main/component/delivery-planning-overview/component/delivery-planning-overview-tile/component/delivery-planning-overview-tile-line/style/_layout.scss +25 -10
- package/lib/component/delivery-planning-main/component/delivery-planning-overview/component/delivery-planning-overview-tile/delivery-planning-overview-tile.component.d.ts +9 -0
- package/lib/component/delivery-planning-main/component/delivery-planning-overview/component/delivery-planning-overview-tile/style/_layout.scss +13 -0
- package/lib/component/delivery-planning-main/component/delivery-planning-overview/component/delivery-planning-overview-tile-settings-popup/delivery-planning-overview-tile-settings-popup.component.d.ts +14 -3
- package/lib/component/delivery-planning-main/component/delivery-planning-overview/delivery-planning-overview.component.d.ts +16 -0
- package/lib/component/delivery-planning-main/component/delivery-planning-overview/style/_layout.scss +9 -6
- package/lib/component/delivery-planning-main/style/_layout.scss +0 -1
- package/lib/component/transaction/transaction.component.d.ts +1 -0
- package/lib/component/transaction-card/transaction-card-planning/transaction-card-planning.component.d.ts +19 -0
- package/lib/component/transaction-internal/style/_layout.scss +6 -0
- package/lib/component/transaction-internal/transaction-internal.component.d.ts +1 -0
- package/lib/component/transaction-line-side-panel-planning/style/_layout.scss +20 -17
- package/lib/component/transaction-line-side-panel-sales/transaction-line-side-panel-sales-reservation/transaction-line-side-panel-sales-reservation/style/_layout.scss +16 -4
- package/lib/component/transaction-line-side-panel-sales/transaction-line-side-panel-sales-reservation/transaction-line-side-panel-sales-reservation/transaction-line-side-panel-sales-reservation.component.d.ts +5 -1
- package/lib/component/transaction-lines-side-panel/transaction-lines-side-panel-service-order/style/_layout.scss +16 -0
- package/lib/component/transaction-lines-side-panel/transaction-lines-side-panel-service-order/transaction-lines-side-panel-service-order.component.d.ts +2 -0
- package/lib/component/transaction-search/transaction-search-tile/transaction-purchase-reservation-order-tile/style/_layout.scss +26 -20
- package/lib/component/transaction-service-overview/style/_layout.scss +4 -0
- package/lib/enum/icon.enum.d.ts +8 -0
- package/package.json +1 -1
|
@@ -16,6 +16,7 @@ import { RelationListObject } from "@colijnit/transactionapi/build/model/relatio
|
|
|
16
16
|
import { UserGroup } from "@colijnit/transactionapi/build/model/user-group.bo";
|
|
17
17
|
import { DeliveryPlanningOverviewTileComponent } from "../../delivery-planning-main/component/delivery-planning-overview/component/delivery-planning-overview-tile/delivery-planning-overview-tile.component";
|
|
18
18
|
import { DeliveryPlanningTileModes } from "../../../enum/delivery-planning-tile-modes.enum";
|
|
19
|
+
import { Subject } from "rxjs";
|
|
19
20
|
export declare class DeliveryPlanningService {
|
|
20
21
|
private _transaction;
|
|
21
22
|
private _dragging;
|
|
@@ -33,7 +34,9 @@ export declare class DeliveryPlanningService {
|
|
|
33
34
|
currentPlanningMode: DeliveryPlanningModes;
|
|
34
35
|
currentPlanning: Planning;
|
|
35
36
|
currentStartDate: Date;
|
|
37
|
+
currentTransId: number;
|
|
36
38
|
linesPlanOrder: PlanOrder;
|
|
39
|
+
availabilityCheckEvent: Subject<number>;
|
|
37
40
|
get dragging(): boolean;
|
|
38
41
|
get planTransportWeek(): PlanningTransportWeek[];
|
|
39
42
|
get deliveryMethods(): DeliveryMethod[];
|
|
@@ -56,4 +59,5 @@ export declare class DeliveryPlanningService {
|
|
|
56
59
|
addHours(date: Date, hours: number): Date;
|
|
57
60
|
queryListTile(transportId: number): DeliveryPlanningOverviewTileComponent;
|
|
58
61
|
getPlanningTransportWeek(): Promise<any[]>;
|
|
62
|
+
totalAssemblyTime(planOrder: PlanOrder): number;
|
|
59
63
|
}
|
|
@@ -1,12 +1,29 @@
|
|
|
1
1
|
@include export-module('cc-delivery-planning-layout') {
|
|
2
2
|
@import "../../delivery-planning-main/style/material";
|
|
3
3
|
.co-delivery-planning {
|
|
4
|
+
position: relative;
|
|
4
5
|
* {
|
|
5
6
|
font-family: $font-family;
|
|
6
7
|
}
|
|
7
8
|
.row {
|
|
8
9
|
display: flex;
|
|
9
10
|
flex-direction: row;
|
|
11
|
+
.wrapper {
|
|
12
|
+
.delivery-main-wrapper {
|
|
13
|
+
.co-delivery-planning-overview {
|
|
14
|
+
.delivery-overview-wrapper {
|
|
15
|
+
.tile-view-modes {
|
|
16
|
+
top: 30px;
|
|
17
|
+
right: 60px;
|
|
18
|
+
.co-icon {
|
|
19
|
+
width: 35px;
|
|
20
|
+
height: 35px;
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
}
|
|
10
27
|
}
|
|
11
28
|
.co-delivery-planning-main {
|
|
12
29
|
width: 100%;
|
|
@@ -14,7 +31,6 @@
|
|
|
14
31
|
gap: 2em;
|
|
15
32
|
.transactions-wrapper {
|
|
16
33
|
.block {
|
|
17
|
-
|
|
18
34
|
height: 1200px
|
|
19
35
|
}
|
|
20
36
|
}
|
|
@@ -74,6 +90,11 @@
|
|
|
74
90
|
.co-delivery-planning-overview {
|
|
75
91
|
.delivery-overview-wrapper {
|
|
76
92
|
width: 100%;
|
|
93
|
+
.tile-view-modes {
|
|
94
|
+
position: absolute;
|
|
95
|
+
top: 20px;
|
|
96
|
+
right: 20px;
|
|
97
|
+
}
|
|
77
98
|
.block {
|
|
78
99
|
flex: 1;
|
|
79
100
|
margin: 1em;
|
|
@@ -10,22 +10,25 @@ import { DeliveryPlanningService } from "../../../../../delivery-planning/servic
|
|
|
10
10
|
export declare class DeliveryPlanningOverviewPopupComponent implements OnDestroy {
|
|
11
11
|
iconCacheService: IconCacheService;
|
|
12
12
|
private _transaction;
|
|
13
|
-
|
|
13
|
+
deliveryPlanningService: DeliveryPlanningService;
|
|
14
|
+
private _transportWeekDay;
|
|
14
15
|
icons: typeof Icon;
|
|
15
16
|
planOrder: PlanOrder;
|
|
16
17
|
transaction: TransactionInfoResponse;
|
|
17
|
-
transportDay: PlanningTransportWeekDay;
|
|
18
|
+
set transportDay(transportWeekDay: PlanningTransportWeekDay);
|
|
19
|
+
get transportDay(): PlanningTransportWeekDay;
|
|
18
20
|
week: PlanningTransportWeek;
|
|
19
21
|
closeEvent: EventEmitter<void>;
|
|
20
22
|
onSucceededPlanAction: EventEmitter<[PlanOrder, PlanningTransportWeekDay, PlanningTransportWeek]>;
|
|
21
23
|
showClass(): boolean;
|
|
22
|
-
constructor(iconCacheService: IconCacheService, _transaction: TransactionService,
|
|
24
|
+
constructor(iconCacheService: IconCacheService, _transaction: TransactionService, deliveryPlanningService: DeliveryPlanningService);
|
|
23
25
|
ngOnDestroy(): void;
|
|
24
|
-
|
|
26
|
+
impactTime(): number;
|
|
25
27
|
closePopup(): void;
|
|
26
28
|
handleCommitClick(): void;
|
|
27
29
|
startTimeForOrder(): Date;
|
|
28
30
|
endTimeForOrder(): Date;
|
|
29
|
-
handleStartTimeChange(
|
|
30
|
-
handleEndTimeChange(
|
|
31
|
+
handleStartTimeChange(timeString: string): void;
|
|
32
|
+
handleEndTimeChange(timeString: string): void;
|
|
33
|
+
handleInitialTimePlanning(transportWeekDay: PlanningTransportWeekDay): void;
|
|
31
34
|
}
|
|
@@ -8,11 +8,14 @@ export declare class DeliveryPlanningOverviewTileLineComponent {
|
|
|
8
8
|
readonly icons: typeof Icon;
|
|
9
9
|
expanded: boolean;
|
|
10
10
|
linesActive: boolean;
|
|
11
|
+
orderLines: boolean;
|
|
11
12
|
order: PlanOrder;
|
|
13
|
+
isActive: boolean;
|
|
12
14
|
deleteLineEvent: EventEmitter<PlanOrder>;
|
|
13
15
|
showClass(): boolean;
|
|
14
16
|
constructor(iconCacheService: IconCacheService);
|
|
15
17
|
handleDeleteLineClick(order: PlanOrder): void;
|
|
16
18
|
setLinesActive(): void;
|
|
19
|
+
showOrderLines(event: Event): void;
|
|
17
20
|
getPlannedLines(lines: PlanOrderLine[]): PlanOrderLine[];
|
|
18
21
|
}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
@include export-module('cc-delivery-planning-overview-tile-line-layout') {
|
|
2
2
|
.co-delivery-planning-overview-tile-line {
|
|
3
3
|
display: flex;
|
|
4
|
-
border: 1px solid #f8f8fa;
|
|
5
4
|
border-radius: 3px;
|
|
6
5
|
.planning-line-wrapper {
|
|
7
6
|
width: 100%;
|
|
@@ -10,14 +9,17 @@
|
|
|
10
9
|
justify-content: space-between;
|
|
11
10
|
position: relative;
|
|
12
11
|
&.active-lines {
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
12
|
+
.order-line-list-wrapper {
|
|
13
|
+
position: relative;
|
|
14
|
+
&:before {
|
|
15
|
+
content: '';
|
|
16
|
+
width: 4px;
|
|
17
|
+
height: 100%;
|
|
18
|
+
position: absolute;
|
|
19
|
+
left: 4px;
|
|
20
|
+
top: 0;
|
|
21
|
+
background: #1a73e8;
|
|
22
|
+
}
|
|
21
23
|
}
|
|
22
24
|
}
|
|
23
25
|
}
|
|
@@ -38,6 +40,11 @@
|
|
|
38
40
|
}
|
|
39
41
|
.planning-line-actions {
|
|
40
42
|
display: flex;
|
|
43
|
+
co-icon {
|
|
44
|
+
width: 12px;
|
|
45
|
+
height: 12px;
|
|
46
|
+
cursor: pointer;
|
|
47
|
+
}
|
|
41
48
|
}
|
|
42
49
|
.planning-line-extend {
|
|
43
50
|
co-icon {
|
|
@@ -46,6 +53,15 @@
|
|
|
46
53
|
cursor: pointer;
|
|
47
54
|
}
|
|
48
55
|
}
|
|
56
|
+
.planning-order {
|
|
57
|
+
display: flex;
|
|
58
|
+
align-items: center;
|
|
59
|
+
gap: 5px;
|
|
60
|
+
.co-icon {
|
|
61
|
+
width: 12px;
|
|
62
|
+
height: 12px;
|
|
63
|
+
}
|
|
64
|
+
}
|
|
49
65
|
}
|
|
50
66
|
.order-line-list-wrapper {
|
|
51
67
|
animation: activeIn 0.5s forwards;
|
|
@@ -54,7 +70,6 @@
|
|
|
54
70
|
align-items: flex-start;
|
|
55
71
|
gap: 3px;
|
|
56
72
|
padding: 20px 20px;
|
|
57
|
-
background: #f8f8fa;
|
|
58
73
|
.order-lines {
|
|
59
74
|
display: flex;
|
|
60
75
|
gap: 10px;
|
|
@@ -21,12 +21,17 @@ export declare class DeliveryPlanningOverviewTileComponent implements OnInit {
|
|
|
21
21
|
getTransportOrdersEvent: EventEmitter<PlanningTransportWeekDay>;
|
|
22
22
|
updatePlanningTransportWeek: EventEmitter<void>;
|
|
23
23
|
openSettingsDialogEvent: EventEmitter<PlanningTransportWeekDay>;
|
|
24
|
+
calendarPlanEvent: EventEmitter<{
|
|
25
|
+
currentHour: string;
|
|
26
|
+
data: string;
|
|
27
|
+
}>;
|
|
24
28
|
get tileMode(): DeliveryPlanningTileModes;
|
|
25
29
|
expanded: boolean;
|
|
26
30
|
showClass(): boolean;
|
|
27
31
|
constructor(_datePipe: DatePipe, _deliveryPlanningService: DeliveryPlanningService, iconCacheService: IconCacheService);
|
|
28
32
|
ngOnInit(): Promise<void>;
|
|
29
33
|
drop(event: CdkDragDrop<string[]>): void;
|
|
34
|
+
handleDrop(event: DragEvent): void;
|
|
30
35
|
formattedDate(date: Date): string;
|
|
31
36
|
expandedChange(): void;
|
|
32
37
|
handleDeleteLineClick(order: PlanOrder): void;
|
|
@@ -34,4 +39,8 @@ export declare class DeliveryPlanningOverviewTileComponent implements OnInit {
|
|
|
34
39
|
onCustomDragStart(event: DragEvent, obj: PlanOrder): void;
|
|
35
40
|
openSettingsDialog(): void;
|
|
36
41
|
handleTimeChangeEvent(obj: Object): void;
|
|
42
|
+
handleCalendarPlanEvent(data: {
|
|
43
|
+
currentHour: string;
|
|
44
|
+
data: string;
|
|
45
|
+
}): void;
|
|
37
46
|
}
|
|
@@ -103,5 +103,18 @@
|
|
|
103
103
|
}
|
|
104
104
|
}
|
|
105
105
|
}
|
|
106
|
+
.co-hour-scheduling {
|
|
107
|
+
padding: 15px 0;
|
|
108
|
+
.time-block {
|
|
109
|
+
.object-half {
|
|
110
|
+
padding: 0;
|
|
111
|
+
.co-delivery-planning-overview-tile-line {
|
|
112
|
+
.planning-line-wrapper {
|
|
113
|
+
padding: 5px;
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
}
|
|
106
119
|
}
|
|
107
120
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { EventEmitter, OnInit } from "@angular/core";
|
|
1
|
+
import { EventEmitter, OnDestroy, OnInit } from "@angular/core";
|
|
2
2
|
import { PlanningTransportWeekDay } from "@colijnit/transactionapi/build/model/planning-transport-week-day.bo";
|
|
3
3
|
import { District } from "@colijnit/transactionapi/build/model/district.bo";
|
|
4
4
|
import { DeliveryMethod } from "@colijnit/transactionapi/build/model/delivery-method.bo";
|
|
@@ -8,22 +8,31 @@ import { UserGroup } from "@colijnit/transactionapi/build/model/user-group.bo";
|
|
|
8
8
|
import { DeliveryPlanningService } from "../../../../../delivery-planning/service/delivery-planning.service";
|
|
9
9
|
import { Icon } from "../../../../../../enum/icon.enum";
|
|
10
10
|
import { IconCacheService } from "../../../../../../service/icon-cache.service";
|
|
11
|
-
|
|
11
|
+
import { TransactionConnectorService } from "../../../../../../service/transaction-connector.service";
|
|
12
|
+
import { PlanOrder } from "@colijnit/transactionapi/build/model/plan-order.bo";
|
|
13
|
+
export declare class DeliveryPlanningOverviewTileSettingsPopupComponent implements OnInit, OnDestroy {
|
|
12
14
|
private _deliveryPlanningService;
|
|
13
15
|
iconCacheService: IconCacheService;
|
|
16
|
+
private _transaction;
|
|
14
17
|
readonly icons: typeof Icon;
|
|
15
18
|
settingsChanged: boolean;
|
|
19
|
+
private _subs;
|
|
16
20
|
transportDay: PlanningTransportWeekDay;
|
|
17
21
|
closeEvent: EventEmitter<void>;
|
|
18
22
|
onSaveAction: EventEmitter<boolean>;
|
|
23
|
+
availabilityChecked: EventEmitter<{
|
|
24
|
+
transportDay: PlanningTransportWeekDay;
|
|
25
|
+
available: boolean;
|
|
26
|
+
}>;
|
|
19
27
|
get districts(): District[];
|
|
20
28
|
get deliveryMethods(): DeliveryMethod[];
|
|
21
29
|
get employees(): RelationListObject[];
|
|
22
30
|
get skills(): Skill[];
|
|
23
31
|
get userGroups(): UserGroup[];
|
|
24
32
|
showClass(): boolean;
|
|
25
|
-
constructor(_deliveryPlanningService: DeliveryPlanningService, iconCacheService: IconCacheService);
|
|
33
|
+
constructor(_deliveryPlanningService: DeliveryPlanningService, iconCacheService: IconCacheService, _transaction: TransactionConnectorService);
|
|
26
34
|
ngOnInit(): void;
|
|
35
|
+
ngOnDestroy(): void;
|
|
27
36
|
districtsForTransportDay(transportDay: PlanningTransportWeekDay): District[];
|
|
28
37
|
deliveryMethodsForTransportDay(transportDay: PlanningTransportWeekDay): DeliveryMethod[];
|
|
29
38
|
skillsForTransportDay(transportDay: PlanningTransportWeekDay): Skill[];
|
|
@@ -33,4 +42,6 @@ export declare class DeliveryPlanningOverviewTileSettingsPopupComponent implemen
|
|
|
33
42
|
handleDistrictsChange(event: District[]): void;
|
|
34
43
|
closePopup(): void;
|
|
35
44
|
handleCommitClick(): void;
|
|
45
|
+
handleAvailabilityChecked(transId: number): Promise<void>;
|
|
46
|
+
getOrderLinesPlanned(planOrder: PlanOrder): Promise<void>;
|
|
36
47
|
}
|
|
@@ -24,6 +24,10 @@ export declare class DeliveryPlanningOverviewComponent implements AfterViewCheck
|
|
|
24
24
|
readonly icons: typeof Icon;
|
|
25
25
|
readonly tileModes: typeof DeliveryPlanningTileModes;
|
|
26
26
|
deliveryPlanningViewModes: typeof DeliveryPlanningViewModes;
|
|
27
|
+
availability: {
|
|
28
|
+
transportDay: PlanningTransportWeekDay;
|
|
29
|
+
available: boolean;
|
|
30
|
+
}[];
|
|
27
31
|
set tiles(tiles: QueryList<DeliveryPlanningOverviewTileComponent>);
|
|
28
32
|
rowContainer: any;
|
|
29
33
|
columnElem: any;
|
|
@@ -67,4 +71,16 @@ export declare class DeliveryPlanningOverviewComponent implements AfterViewCheck
|
|
|
67
71
|
handlePopupPlanEvent(event: [PlanOrder, PlanningTransportWeekDay, PlanningTransportWeek]): Promise<void>;
|
|
68
72
|
handleSettingsSave(changed: boolean): void;
|
|
69
73
|
openSettingsDialog(transportDay: PlanningTransportWeekDay): void;
|
|
74
|
+
handleCalendarPlanEvent(data: {
|
|
75
|
+
currentHour: string;
|
|
76
|
+
data: string;
|
|
77
|
+
}, transportWeekDay: PlanningTransportWeekDay, week: PlanningTransportWeek): Promise<void>;
|
|
78
|
+
calculateStartTime(transportWeekDay: PlanningTransportWeekDay, currentHour: string): Date;
|
|
79
|
+
calculateEndTime(startDate: Date, currentHour: string, planOrder: PlanOrder): Date;
|
|
80
|
+
openPlanningPopup(planOrder: PlanOrder, transportDay: PlanningTransportWeekDay, week: PlanningTransportWeek): void;
|
|
81
|
+
handleAvailabilityChecked(value: {
|
|
82
|
+
transportDay: PlanningTransportWeekDay;
|
|
83
|
+
available: boolean;
|
|
84
|
+
}): void;
|
|
85
|
+
checkAvailable(transportDay: PlanningTransportWeekDay): boolean;
|
|
70
86
|
}
|
package/lib/component/delivery-planning-main/component/delivery-planning-overview/style/_layout.scss
CHANGED
|
@@ -49,7 +49,7 @@
|
|
|
49
49
|
}
|
|
50
50
|
.sc-agenda {
|
|
51
51
|
.month-description {
|
|
52
|
-
top: -
|
|
52
|
+
top: -30px;
|
|
53
53
|
}
|
|
54
54
|
}
|
|
55
55
|
}
|
|
@@ -59,14 +59,17 @@
|
|
|
59
59
|
}
|
|
60
60
|
|
|
61
61
|
.tile-view-modes{
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
62
|
+
right: 10px;
|
|
63
|
+
gap: 5px;
|
|
65
64
|
co-icon {
|
|
66
65
|
fill: black;
|
|
67
|
-
|
|
66
|
+
cursor: pointer;
|
|
67
|
+
padding: 5px;
|
|
68
|
+
width: 30px;
|
|
69
|
+
height: 30px;
|
|
68
70
|
&.active {
|
|
69
|
-
|
|
71
|
+
background: $color-action;
|
|
72
|
+
fill: white;
|
|
70
73
|
}
|
|
71
74
|
}
|
|
72
75
|
}
|
|
@@ -35,6 +35,7 @@ export declare class TransactionComponent implements OnChanges {
|
|
|
35
35
|
cancelIconData: SafeHtml;
|
|
36
36
|
showSaveCancelLabels: boolean;
|
|
37
37
|
saveCancelMovable: boolean;
|
|
38
|
+
transactionPlanning: boolean;
|
|
38
39
|
showClass(): boolean;
|
|
39
40
|
checkTransaction(): any;
|
|
40
41
|
checkRollBack(): void;
|
|
@@ -1,11 +1,30 @@
|
|
|
1
|
+
import { ChangeDetectorRef } from '@angular/core';
|
|
1
2
|
import { TransactionBaseComponent } from '../../core/base/transaction-base.component';
|
|
2
3
|
import { TransactionLineActionButtonsComponent } from '../../transaction-line-action-buttons/transaction-line-action-buttons.component';
|
|
3
4
|
import { TransactionLineInfo } from '@colijnit/transactionapi/build/model/transaction-line-info.bo';
|
|
4
5
|
import { StatusBarCfgNames } from '../../../interface/status-bar-cfg-names.interface';
|
|
5
6
|
import { LineDiscountCfgNames } from "../../../interface/line-discount-cfg-names.interface";
|
|
7
|
+
import { DeliveryPlanningService } from "../../delivery-planning/service/delivery-planning.service";
|
|
8
|
+
import { TransactionEventService } from "../../../service/transaction-event.service";
|
|
9
|
+
import { IconCacheService } from "../../../service/icon-cache.service";
|
|
10
|
+
import { TransactionScreenConfigurationService } from "../../../service/transaction-screen-configuration.service";
|
|
11
|
+
import { OrderLineSetService } from "../../../service/order-line-set-service";
|
|
12
|
+
import { TransactionImageService } from "../../../service/transaction-image.service";
|
|
13
|
+
import { DictionaryService } from "../../../service/dictionary.service";
|
|
14
|
+
import { TransactionService } from "../../../service/transaction.service";
|
|
6
15
|
export declare class TransactionCardPlanningComponent extends TransactionBaseComponent {
|
|
16
|
+
private _deliveryPlanningService;
|
|
17
|
+
transactionEventService: TransactionEventService;
|
|
18
|
+
iconCacheService: IconCacheService;
|
|
19
|
+
screenConfigService: TransactionScreenConfigurationService;
|
|
20
|
+
orderLineSetService: OrderLineSetService;
|
|
21
|
+
protected imageService: TransactionImageService;
|
|
22
|
+
protected dictionaryService: DictionaryService;
|
|
23
|
+
protected transactionService: TransactionService;
|
|
24
|
+
protected changeDetector: ChangeDetectorRef;
|
|
7
25
|
transactionLineActionButtons: TransactionLineActionButtonsComponent;
|
|
8
26
|
showClass(): boolean;
|
|
27
|
+
constructor(_deliveryPlanningService: DeliveryPlanningService, transactionEventService: TransactionEventService, iconCacheService: IconCacheService, screenConfigService: TransactionScreenConfigurationService, orderLineSetService: OrderLineSetService, imageService: TransactionImageService, dictionaryService: DictionaryService, transactionService: TransactionService, changeDetector: ChangeDetectorRef);
|
|
9
28
|
expanded: boolean;
|
|
10
29
|
handleShowSidePanel(line: TransactionLineInfo): void;
|
|
11
30
|
statusBarConfigNames: StatusBarCfgNames;
|
|
@@ -114,6 +114,12 @@
|
|
|
114
114
|
@media(max-width: 900px) {
|
|
115
115
|
grid-template-columns: 100%;
|
|
116
116
|
}
|
|
117
|
+
&.planning-cards {
|
|
118
|
+
grid-template-columns: 50% 50%;
|
|
119
|
+
@media(max-width: 900px) {
|
|
120
|
+
grid-template-columns: 100%;
|
|
121
|
+
}
|
|
122
|
+
}
|
|
117
123
|
}
|
|
118
124
|
.transaction-lines-wrapper {
|
|
119
125
|
padding: $tp-transaction-transaction-lines-wrapper-padding;
|
|
@@ -55,6 +55,7 @@ export declare class TransactionInternalComponent implements OnDestroy {
|
|
|
55
55
|
get transaction(): TransactionInfoResponse;
|
|
56
56
|
showHeader: boolean;
|
|
57
57
|
showViewModeButtons: boolean;
|
|
58
|
+
transactionPlanning: boolean;
|
|
58
59
|
relationChange: EventEmitter<RelationAnyType>;
|
|
59
60
|
showQuickAccess: boolean;
|
|
60
61
|
showButtonBar: boolean;
|
|
@@ -5,30 +5,24 @@
|
|
|
5
5
|
co-transaction-line-side-panel-planning {
|
|
6
6
|
.wrapper {
|
|
7
7
|
padding: 1em;
|
|
8
|
-
|
|
9
8
|
.delivery-method-wrapper {
|
|
10
9
|
.methods-wrapper {
|
|
11
10
|
padding: 1em;
|
|
12
11
|
display: flex;
|
|
13
12
|
flex-direction: row;
|
|
14
13
|
justify-content: space-between;
|
|
15
|
-
|
|
16
14
|
.method {
|
|
17
15
|
&.selected {
|
|
18
16
|
border: 2px solid $planning-lsp-method-selected-color;
|
|
19
17
|
}
|
|
20
|
-
|
|
21
18
|
padding: 0.5em 1em;
|
|
22
19
|
height: 100px;
|
|
23
20
|
display: flex;
|
|
24
21
|
flex-direction: row;
|
|
25
|
-
|
|
26
22
|
.radio-wrapper {
|
|
27
|
-
|
|
28
23
|
display: flex;
|
|
29
24
|
justify-content: center;
|
|
30
25
|
align-items: center;
|
|
31
|
-
|
|
32
26
|
co-input-radio-button {
|
|
33
27
|
.outer-circle {
|
|
34
28
|
border-color: $planning-lsp-radio-color;
|
|
@@ -39,7 +33,6 @@
|
|
|
39
33
|
}
|
|
40
34
|
}
|
|
41
35
|
}
|
|
42
|
-
|
|
43
36
|
.body-wrapper {
|
|
44
37
|
width: 75%;
|
|
45
38
|
display: flex;
|
|
@@ -55,13 +48,11 @@
|
|
|
55
48
|
}
|
|
56
49
|
}
|
|
57
50
|
}
|
|
58
|
-
|
|
59
51
|
.send-button-wrapper {
|
|
60
52
|
display: flex;
|
|
61
53
|
width: 100%;
|
|
62
54
|
justify-content: start;
|
|
63
55
|
padding: 1em;
|
|
64
|
-
|
|
65
56
|
co-button {
|
|
66
57
|
display: flex;
|
|
67
58
|
justify-content: center;
|
|
@@ -71,14 +62,11 @@
|
|
|
71
62
|
color: $planning-lsp-send-button-text-color;
|
|
72
63
|
background-color: $planning-lsp-send-button-color;
|
|
73
64
|
}
|
|
74
|
-
|
|
75
65
|
}
|
|
76
|
-
|
|
77
66
|
.header-info-wrapper {
|
|
78
67
|
display: flex;
|
|
79
68
|
flex-direction: row;
|
|
80
69
|
gap: 1em;
|
|
81
|
-
|
|
82
70
|
.block {
|
|
83
71
|
padding: 1em;
|
|
84
72
|
display: flex;
|
|
@@ -86,36 +74,51 @@
|
|
|
86
74
|
justify-content: center;
|
|
87
75
|
align-items: center;
|
|
88
76
|
gap: 0.5em;
|
|
89
|
-
|
|
90
77
|
.header {
|
|
91
78
|
text-align: center;
|
|
92
79
|
color: $planning-lsp-header-text-color;
|
|
93
80
|
}
|
|
94
|
-
|
|
95
81
|
.text {
|
|
96
82
|
text-align: center;
|
|
97
83
|
}
|
|
98
84
|
}
|
|
99
85
|
}
|
|
100
|
-
|
|
101
86
|
.track-and-trace-header {
|
|
102
87
|
padding: 1em;
|
|
103
88
|
font-weight: bold;
|
|
104
89
|
font-size: 12px;
|
|
105
90
|
}
|
|
106
|
-
|
|
107
91
|
.track-and-trace-body-wrapper {
|
|
108
92
|
.code-wrapper {
|
|
109
93
|
display: flex;
|
|
110
94
|
flex-direction: row;
|
|
111
95
|
gap: 1em;
|
|
112
96
|
}
|
|
113
|
-
|
|
114
97
|
display: flex;
|
|
115
98
|
gap: 0.5em;
|
|
116
99
|
flex-direction: column;
|
|
117
100
|
padding: 1em;
|
|
118
101
|
}
|
|
102
|
+
&.line-side-planning {
|
|
103
|
+
position: relative;
|
|
104
|
+
.co-delivery-planning {
|
|
105
|
+
.co-delivery-planning-main {
|
|
106
|
+
.co-delivery-planning-overview {
|
|
107
|
+
.delivery-overview-wrapper {
|
|
108
|
+
position: unset;
|
|
109
|
+
.tile-view-modes {
|
|
110
|
+
right: 30px;
|
|
111
|
+
top: 30px;
|
|
112
|
+
.co-icon {
|
|
113
|
+
width: 30px;
|
|
114
|
+
height: 30px;
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
}
|
|
119
122
|
}
|
|
120
123
|
}
|
|
121
124
|
}
|
|
@@ -1,14 +1,26 @@
|
|
|
1
1
|
@include export-module('cc-transaction-line-side-panel-sales-reservation-layout') {
|
|
2
2
|
.co-transaction-line-side-panel-sales-reservation {
|
|
3
|
-
|
|
4
3
|
.wrapper{
|
|
5
4
|
display: flex;
|
|
6
5
|
width: 100%;
|
|
7
6
|
height: 100%;
|
|
8
|
-
justify-content: center;
|
|
9
|
-
margin: 2em;
|
|
10
7
|
flex-direction: column;
|
|
11
|
-
gap:
|
|
8
|
+
gap: 15px;
|
|
9
|
+
padding: 15px 16px 15px 30px;
|
|
10
|
+
}
|
|
11
|
+
.save-cancel-wrapper {
|
|
12
|
+
position: sticky;
|
|
13
|
+
bottom: 0;
|
|
14
|
+
padding: 30px 0;
|
|
15
|
+
background: #f8f8fa;
|
|
16
|
+
}
|
|
17
|
+
.reservation-title {
|
|
18
|
+
display: flex;
|
|
19
|
+
align-items: center;
|
|
20
|
+
gap: 10px;
|
|
21
|
+
font-size: 14px;
|
|
22
|
+
font-weight: bold;
|
|
23
|
+
margin-bottom: 5px;
|
|
12
24
|
}
|
|
13
25
|
}
|
|
14
26
|
}
|
|
@@ -3,12 +3,16 @@ import { PurchaseReservationPurchaseLine } from "@colijnit/transactionapi/build/
|
|
|
3
3
|
import { PurchaseReservationService } from "../../../../service/purchase-reservation.service";
|
|
4
4
|
import { TransactionService } from "../../../../service/transaction.service";
|
|
5
5
|
import { TransactionEventService } from "../../../../service/transaction-event.service";
|
|
6
|
+
import { IconCacheService } from "../../../../service/icon-cache.service";
|
|
7
|
+
import { Icon } from "../../../../enum/icon.enum";
|
|
6
8
|
export declare class TransactionLineSidePanelSalesReservationComponent implements OnInit {
|
|
7
9
|
private _purchaseReservationService;
|
|
8
10
|
private _transactionService;
|
|
9
11
|
private _transactionEventService;
|
|
12
|
+
iconCacheService: IconCacheService;
|
|
13
|
+
readonly icons: typeof Icon;
|
|
10
14
|
showClass(): boolean;
|
|
11
|
-
constructor(_purchaseReservationService: PurchaseReservationService, _transactionService: TransactionService, _transactionEventService: TransactionEventService);
|
|
15
|
+
constructor(_purchaseReservationService: PurchaseReservationService, _transactionService: TransactionService, _transactionEventService: TransactionEventService, iconCacheService: IconCacheService);
|
|
12
16
|
reservationOrderLines: PurchaseReservationPurchaseLine[];
|
|
13
17
|
ngOnInit(): void;
|
|
14
18
|
processReservation(): Promise<void>;
|
|
@@ -15,9 +15,18 @@
|
|
|
15
15
|
flex-direction: row;
|
|
16
16
|
justify-content: space-between;
|
|
17
17
|
align-items: center;
|
|
18
|
+
&.clickable {
|
|
19
|
+
cursor: pointer;
|
|
20
|
+
}
|
|
18
21
|
.co-icon {
|
|
19
22
|
width: $tp-transaction-lines-side-panel-service-order-label-icon-size;
|
|
20
23
|
height: $tp-transaction-lines-side-panel-service-order-label-icon-size;
|
|
24
|
+
transform: rotate(0deg);
|
|
25
|
+
transition: transform 0.3s ease-in-out;
|
|
26
|
+
&.active {
|
|
27
|
+
transform: rotate(180deg);
|
|
28
|
+
transition: transform 0.3s ease-in-out;
|
|
29
|
+
}
|
|
21
30
|
}
|
|
22
31
|
}
|
|
23
32
|
.detail-label {
|
|
@@ -54,6 +63,8 @@
|
|
|
54
63
|
}
|
|
55
64
|
&.supplier {
|
|
56
65
|
flex-direction: column;
|
|
66
|
+
border-bottom: none;
|
|
67
|
+
padding-bottom: 0;
|
|
57
68
|
.top-details {
|
|
58
69
|
display: flex;
|
|
59
70
|
flex-direction: row;
|
|
@@ -104,5 +115,10 @@
|
|
|
104
115
|
}
|
|
105
116
|
}
|
|
106
117
|
}
|
|
118
|
+
.show-details-wrapper {
|
|
119
|
+
margin-top: 10px;
|
|
120
|
+
padding-top: 15px;
|
|
121
|
+
border-top: 5px solid #F4F4F9;
|
|
122
|
+
}
|
|
107
123
|
}
|
|
108
124
|
}
|
|
@@ -17,7 +17,9 @@ export declare class TransactionLinesSidePanelServiceOrderComponent extends Tran
|
|
|
17
17
|
protected changeDetector: ChangeDetectorRef;
|
|
18
18
|
readonly Icon: typeof Icon;
|
|
19
19
|
showClass(): boolean;
|
|
20
|
+
showDetails: boolean;
|
|
20
21
|
image: string;
|
|
21
22
|
constructor(transactionEventService: TransactionEventService, iconCacheService: IconCacheService, screenConfigService: TransactionScreenConfigurationService, imageService: TransactionImageService, dictionaryService: DictionaryService, transactionService: TransactionService, changeDetector: ChangeDetectorRef);
|
|
23
|
+
showDetailsClick(): void;
|
|
22
24
|
ngOnInit(): Promise<void>;
|
|
23
25
|
}
|