Skip to content

Commit 6cc471a

Browse files
MehranQadriMehranQadri
committed
Merge branch '2026R1' into feature/EDU-9554-2026R1-T200-Course-Update-Code-Snippets
# Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.
2 parents b068d53 + 2785310 commit 6cc471a

159 files changed

Lines changed: 19078 additions & 18808 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,3 +49,5 @@ obj
4949
/UnitTesting/T280/PhoneRepairShop_Code/PhoneRepairShop_Code.Tests/.vs
5050
/ModernUI/T290/SourceFiles/PhoneRepairShop_Code/PhoneRepairShop_Code/bin/Debug
5151
/Customization/T220/PhoneRepairShop_Code/PhoneRepairShop_Code/.vs
52+
/.postman/config.json
53+
/postman/globals/workspace.postman_globals.json

‎Customization/T210/CodeSnippets/Step4.1.2/RS203000.ts‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
2+
import { createCollection, createSingle, graphInfo, PXView, PXScreen, PXFieldState, gridConfig, PXFieldOptions, PXActionState, GridPreset, viewInfo } from "client-controls";
3+
4+
@graphInfo({
5+
graphType: "PhoneRepairShop.RSSVRepairPriceMaint",
6+
primaryView: "RepairPrices",
7+
})
8+
export class RS203000 extends PXScreen {
9+
@viewInfo({containerName: "Repair Prices"})
10+
RepairPrices = createSingle(RSSVRepairPrice);
11+
@viewInfo({containerName: "Repair Items"})
12+
RepairItems = createCollection(RSSVRepairItem);
13+
@viewInfo({containerName: "Labor"})
14+
Labor = createCollection(RSSVLabor);
15+
}
16+
17+
export class RSSVRepairPrice extends PXView {
18+
ServiceID: PXFieldState;
19+
DeviceID: PXFieldState;
20+
Price: PXFieldState;
21+
}
22+
23+
@gridConfig({
24+
preset: GridPreset.Details,
25+
syncPosition: true,
26+
initNewRow: true
27+
})
28+
export class RSSVRepairItem extends PXView {
29+
RepairItemType : PXFieldState<PXFieldOptions.CommitChanges>;
30+
Required : PXFieldState<PXFieldOptions.CommitChanges>;
31+
InventoryID: PXFieldState<PXFieldOptions.CommitChanges>;
32+
InventoryID_description : PXFieldState;
33+
BasePrice : PXFieldState<PXFieldOptions.CommitChanges>;
34+
IsDefault : PXFieldState<PXFieldOptions.CommitChanges>;
35+
}
36+
37+
@gridConfig({
38+
preset: GridPreset.Details
39+
})
40+
export class RSSVLabor extends PXView {
41+
InventoryID : PXFieldState<PXFieldOptions.CommitChanges>;
42+
InventoryID_description : PXFieldState;
43+
DefaultPrice : PXFieldState<PXFieldOptions.CommitChanges>;
44+
Quantity : PXFieldState<PXFieldOptions.CommitChanges>;
45+
ExtPrice : PXFieldState;
46+
}

‎Customization/T210/PhoneRepairShop_Code/PhoneRepairShop_Code/RSSVRepairPriceMaint.cs‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,21 @@ public SelectFrom<RSSVWarranty>.
3939
public SelectFrom<ContractTemplate>.
4040
Where<ContractTemplate.contractCD.IsEqual<defaultWarranty>>.
4141
View DefaultWarranty = null!;
42+
43+
public PXFilter<MasterTable> MasterView;
44+
public PXFilter<DetailsTable> DetailsView;
45+
46+
[Serializable]
47+
public class MasterTable : PXBqlTable, IBqlTable
48+
{
49+
50+
}
51+
52+
[Serializable]
53+
public class DetailsTable : PXBqlTable, IBqlTable
54+
{
55+
56+
}
4257
#endregion
4358

4459
#region Event Handlers

‎Customization/T220/PhoneRepairShop/Bin/PhoneRepairShop_Code.dll‎

4.5 KB
Binary file not shown.

Customization/T250/PhoneRepairShop/FrontendSources/screen/src/development/screens/IN/IN202500/extensions/IN202500_PhoneRepairShop3_generated.html renamed to Customization/T220/PhoneRepairShop/FrontendSources/screen/src/development/screens/IN/IN202500/extensions/IN202500_PhoneRepairShop_generated.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<field name="ItemSettings.UsrRepairItem" after="#fsItemDefaults-General FIELD[name='ItemType']"></field>
33
<field name="ItemSettings.UsrRepairItemType" after="#fsItemDefaults-General FIELD[name='ItemSettings.UsrRepairItem']"></field>
44
<qp-tab id="tab-CompatibleDevices" caption="Compatible Devices" after="#tab-PriceCost">
5-
<qp-grid id="grid-CompatibleDevices" view.bind="CompatibleDevices">
6-
</qp-grid>
7-
</qp-tab>
5+
<qp-grid id="grid-CompatibleDevices" view.bind="CompatibleDevices">
6+
</qp-grid>
7+
</qp-tab>
88
</template>

‎Customization/T220/PhoneRepairShop/FrontendSources/screen/src/development/screens/IN/IN202500/extensions/IN202500_PhoneRepairShop_generated.ts‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
import {
2+
PXFieldState,
3+
PXView,
4+
viewInfo,
5+
gridConfig,
6+
fieldInfo,
7+
GridPreset,
8+
createCollection,
9+
PXFieldOptions
10+
} from "client-controls";
11+
import { IN202500, ItemSettings } from "src/screens/IN/IN202500/IN202500";
12+
13+
export interface IN202500_PhoneRepairShop_generated extends IN202500 {}
14+
export class IN202500_PhoneRepairShop_generated {
15+
@viewInfo({ containerName: "Compatible Devices" })
16+
CompatibleDevices = createCollection(RSSVStockItemDevice);
17+
}
18+
19+
export interface ItemSettings_PhoneRepairShop_generated extends ItemSettings {}
20+
export class ItemSettings_PhoneRepairShop_generated {
21+
@fieldInfo({ commitChanges: true })
22+
UsrRepairItem: PXFieldState;
23+
24+
UsrRepairItemType: PXFieldState;
25+
}
26+
27+
@gridConfig({ preset: GridPreset.Details })
28+
export class RSSVStockItemDevice extends PXView {
29+
DeviceID: PXFieldState<PXFieldOptions.CommitChanges>;
30+
DeviceID_description: PXFieldState;
31+
}

‎Customization/T220/PhoneRepairShop/FrontendSources/screen/src/development/screens/RS/RS101000/RS101000.html‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<template>
2-
<qp-template id="form-RepairWorkOrderPreferences" name="1-1"
3-
class="label-size-xm">
4-
<qp-fieldset id="fsPreferences-RepairWorkOrder" slot="A" view.bind="Setup">
5-
<field name="NumberingID"></field>
6-
<field name="WalkInCustomerID"></field>
7-
<field name="DefaultEmployee"></field>
8-
<field name="PrepaymentPercent"></field>
9-
</qp-fieldset>
10-
</qp-template>
2+
<qp-template id="form-RepairWorkOrderPreferences" name="1-1"
3+
class="label-size-xm">
4+
<qp-fieldset id="fsPreferences-RepairWorkOrder" slot="A" view.bind="Setup">
5+
<field name="NumberingID"></field>
6+
<field name="WalkInCustomerID"></field>
7+
<field name="DefaultEmployee"></field>
8+
<field name="PrepaymentPercent"></field>
9+
</qp-fieldset>
10+
</qp-template>
1111
</template>

‎Customization/T220/PhoneRepairShop/FrontendSources/screen/src/development/screens/RS/RS201000/RS201000.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<template>
2-
<qp-grid id="grid-RepairService" view.bind="RepairService"></qp-grid>
3-
</template>
2+
<qp-grid id="grid-RepairService" view.bind="RepairService"></qp-grid>
3+
</template>

‎Customization/T220/PhoneRepairShop/FrontendSources/screen/src/development/screens/RS/RS201000/RS201000.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
import {
32
PXScreen, graphInfo, createCollection,
43
PXView, PXFieldState,
@@ -15,6 +14,7 @@ export class RS201000 extends PXScreen {
1514
RepairService = createCollection(RSSVRepairService);
1615
}
1716

17+
// View
1818
@gridConfig({
1919
preset: GridPreset.Primary
2020
})

‎Customization/T220/PhoneRepairShop/FrontendSources/screen/src/development/screens/RS/RS202000/RS202000.html‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<template>
2-
<qp-template id="form-ServDevices" name="1-1">
3-
<qp-fieldset id="fsColumnA" slot="A" view.bind="ServDevices">
4-
<field name="DeviceCD"></field>
5-
<field name="Description"></field>
6-
<field name="Active"></field>
7-
<field name="AvgComplexityOfRepair"></field>
8-
</qp-fieldset>
9-
</qp-template>
10-
</template>
2+
<qp-template id="form-ServDevices" name="1-1">
3+
<qp-fieldset id="fsColumnA" slot="A" view.bind="ServDevices">
4+
<field name="DeviceCD"></field>
5+
<field name="Description"></field>
6+
<field name="Active"></field>
7+
<field name="AvgComplexityOfRepair"></field>
8+
</qp-fieldset>
9+
</qp-template>
10+
</template>

0 commit comments

Comments
 (0)