Skip to content

Commit edb2ecb

Browse files
renemadsenrenemadsen
committed
Fixing document issue.
1 parent d728a17 commit edb2ecb

File tree

9 files changed

+38
-20
lines changed

9 files changed

+38
-20
lines changed

‎eFormAPI/Plugins/BackendConfiguration.Pn/BackendConfiguration.Pn.Integration.Test/SQL/420_eform-angular-time-planning-plugin.sql‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,13 @@ CREATE TABLE `AssignedSiteVersions` (
176176
`WednesdayPlanHours` int(11) NOT NULL DEFAULT 0,
177177
`UsePunchClock` tinyint(1) NOT NULL DEFAULT 0,
178178
`UseDetailedPauseEditing` tinyint(1) NOT NULL DEFAULT 0,
179+
`UsePunchClockWithAllowRegisteringInHistory` tinyint(1) NOT NULL DEFAULT 0,
180+
`FifthShiftActive` tinyint(1) NOT NULL DEFAULT 0,
181+
`FourthShiftActive` tinyint(1) NOT NULL DEFAULT 0,
182+
`ThirdShiftActive` tinyint(1) NOT NULL DEFAULT 0,
183+
`DaysBackInTimeAllowedEditing` int(11) NOT NULL DEFAULT 0,
184+
`DaysBackInTimeAllowedEditingEnabled` tinyint(1) NOT NULL DEFAULT 0,
185+
`ResignedAtDate` datetime(6) NOT NULL DEFAULT '0001-01-01 00:00:00.000000',
179186
PRIMARY KEY (`Id`)
180187
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
181188
/*!40101 SET character_set_client = @saved_cs_client */;
@@ -340,6 +347,13 @@ CREATE TABLE `AssignedSites` (
340347
`WednesdayPlanHours` int(11) NOT NULL DEFAULT 0,
341348
`UsePunchClock` tinyint(1) NOT NULL DEFAULT 0,
342349
`UseDetailedPauseEditing` tinyint(1) NOT NULL DEFAULT 0,
350+
`UsePunchClockWithAllowRegisteringInHistory` tinyint(1) NOT NULL DEFAULT 0,
351+
`FifthShiftActive` tinyint(1) NOT NULL DEFAULT 0,
352+
`FourthShiftActive` tinyint(1) NOT NULL DEFAULT 0,
353+
`ThirdShiftActive` tinyint(1) NOT NULL DEFAULT 0,
354+
`DaysBackInTimeAllowedEditing` int(11) NOT NULL DEFAULT 0,
355+
`DaysBackInTimeAllowedEditingEnabled` tinyint(1) NOT NULL DEFAULT 0,
356+
`ResignedAtDate` datetime(6) NOT NULL DEFAULT '0001-01-01 00:00:00.000000',
343357
PRIMARY KEY (`Id`)
344358
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
345359
/*!40101 SET character_set_client = @saved_cs_client */;
@@ -494,6 +508,8 @@ CREATE TABLE `PlanRegistrationVersions` (
494508
`Stop5Id` int(11) NOT NULL DEFAULT 0,
495509
`Stop5StoppedAt` datetime(6) DEFAULT NULL,
496510
`PlanChangedByAdmin` tinyint(1) NOT NULL DEFAULT 0,
511+
`NettoHoursOverride` int(11) NOT NULL DEFAULT 0,
512+
`NettoHoursOverrideActive` tinyint(1) NOT NULL DEFAULT 0,
497513
PRIMARY KEY (`Id`)
498514
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
499515
/*!40101 SET character_set_client = @saved_cs_client */;
@@ -630,6 +646,8 @@ CREATE TABLE `PlanRegistrations` (
630646
`Stop5Id` int(11) NOT NULL DEFAULT 0,
631647
`Stop5StoppedAt` datetime(6) DEFAULT NULL,
632648
`PlanChangedByAdmin` tinyint(1) NOT NULL DEFAULT 0,
649+
`NettoHoursOverride` int(11) NOT NULL DEFAULT 0,
650+
`NettoHoursOverrideActive` tinyint(1) NOT NULL DEFAULT 0,
633651
PRIMARY KEY (`Id`),
634652
KEY `IX_PlanRegistrations_MessageId` (`MessageId`),
635653
CONSTRAINT `FK_PlanRegistrations_Messages_MessageId` FOREIGN KEY (`MessageId`) REFERENCES `Messages` (`Id`)

‎eFormAPI/Plugins/BackendConfiguration.Pn/BackendConfiguration.Pn/Infrastructure/Data/Seed/Data/BackendConfigurationSeedEforms.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ public static List<KeyValuePair<string, List<string>>> GetForms()
5454
// headers = ["", "", ""];
5555
// item = new KeyValuePair<string, List<string>>("25.02 Vis kemisk produkt", headers);
5656
// theList.Add(item);
57-
// headers = ["", "", ""];
58-
// item = new KeyValuePair<string, List<string>>("00. Info boks", headers);
59-
// theList.Add(item);
57+
headers = ["", "", ""];
58+
item = new KeyValuePair<string, List<string>>("00. Info boks", headers);
59+
theList.Add(item);
6060

6161
headers = ["", "", ""];
6262
item = new KeyValuePair<string, List<string>>("Kvittering", headers);

‎eFormAPI/Plugins/BackendConfiguration.Pn/BackendConfiguration.Pn/Resources/eForms/00. Info boks.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Main>
3-
<Id>22</Id>
3+
<Id>142657</Id>
44
<Repeated>0</Repeated>
5-
<Label>00. Info boks</Label>
5+
<Label>Info boks</Label>
66
<StartDate>2021-12-02</StartDate>
77
<EndDate>2031-12-02</EndDate>
88
<Language>da</Language>
@@ -13,14 +13,14 @@
1313
<DisplayOrder>0</DisplayOrder>
1414
<ElementList>
1515
<Element type="DataElement">
16-
<Id>22</Id>
17-
<Label>00. Info boks</Label>
16+
<Id>142657</Id>
17+
<Label>Info boks</Label>
1818
<Description><![CDATA[]]></Description>
1919
<DisplayOrder>0</DisplayOrder>
2020
<ReviewEnabled>false</ReviewEnabled>
2121
<ManualSync>false</ManualSync>
2222
<ExtraFieldsEnabled>false</ExtraFieldsEnabled>
23-
<DoneButtonDisabled>true</DoneButtonDisabled>
23+
<DoneButtonDisabled>false</DoneButtonDisabled>
2424
<ApprovalEnabled>false</ApprovalEnabled>
2525
<DataItemList>
2626
<DataItem type="None">

‎eform-client/cypress/e2e/plugins/backend-configuration-pn/c/task-wizard.create-daily.spec.cy.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ describe('Area rules type 1', () => {
101101
cy.get('.cdk-row .cdk-column-property span').should('have.text', task.property);
102102
cy.get('.cdk-row .cdk-column-folder span').should('have.text', bindArea);
103103
cy.get('.cdk-row .cdk-column-taskName span').should('have.text', task.translations[0]);
104-
cy.get('.cdk-row .cdk-column-eform span').should('have.text', task.eformName + ' (9)');
104+
cy.get('.cdk-row .cdk-column-eform span').should('have.text', task.eformName + ' (11)');
105105
cy.get('.cdk-row .cdk-column-startDate span')
106106
.should('have.text', `${task.startFrom.day}.${task.startFrom.month >= 10 ? '' : '0'}${task.startFrom.month}.${task.startFrom.year}`);
107107
cy.get('.cdk-row .cdk-column-repeat span').should('have.text', `${task.repeatEvery} ${task.repeatType}`);

‎eform-client/cypress/e2e/plugins/backend-configuration-pn/c/task-wizard.create.spec.cy.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ describe('Area rules type 1', () => {
9999
cy.get('.cdk-row .cdk-column-property span').should('have.text', task.property);
100100
cy.get('.cdk-row .cdk-column-folder span').should('have.text', bindArea);
101101
cy.get('.cdk-row .cdk-column-taskName span').should('have.text', task.translations[0]);
102-
cy.get('.cdk-row .cdk-column-eform span').should('have.text', task.eformName + ' (9)');
102+
cy.get('.cdk-row .cdk-column-eform span').should('have.text', task.eformName + ' (11)');
103103
cy.get('.cdk-row .cdk-column-startDate span')
104104
.should('have.text', `${task.startFrom.day}.${task.startFrom.month >= 10 ? '' : '0'}${task.startFrom.month}.${task.startFrom.year}`);
105105
cy.get('.cdk-row .cdk-column-repeat span').should('have.text', `${task.repeatType}`);

‎eform-client/cypress/e2e/plugins/backend-configuration-pn/d/task-wizard.copy.cy.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ describe('Area rules type 1', () => {
124124
cy.get('.cdk-row .cdk-column-property span').should('have.text', task.property);
125125
cy.get('.cdk-row .cdk-column-folder span').should('have.text', '00. Logbøger');
126126
cy.get('.cdk-row .cdk-column-taskName span').should('have.text', task.translations[0]);
127-
cy.get('.cdk-row .cdk-column-eform span').should('have.text', task.eformName + ' (9)');
127+
cy.get('.cdk-row .cdk-column-eform span').should('have.text', task.eformName + ' (11)');
128128
cy.get('.cdk-row .cdk-column-startDate span')
129129
.should('have.text', `${task.startFrom.day}.${task.startFrom.month >= 10 ? '' : '0'}${task.startFrom.month}.${task.startFrom.year}`);
130130
cy.get('.cdk-row .cdk-column-repeat span').should('have.text', `${task.repeatEvery} ${task.repeatType}`);
@@ -145,8 +145,8 @@ describe('Area rules type 1', () => {
145145
cy.get('.cdk-row .cdk-column-folder span').eq(1).should('have.text', '00. Logbøger');
146146
cy.get('.cdk-row .cdk-column-taskName span').eq(0).should('have.text', task.translations[0]);
147147
cy.get('.cdk-row .cdk-column-taskName span').eq(1).should('have.text', task.translations[0]);
148-
cy.get('.cdk-row .cdk-column-eform span').eq(0).should('have.text', task.eformName + ' (9)');
149-
cy.get('.cdk-row .cdk-column-eform span').eq(1).should('have.text', task.eformName + ' (9)');
148+
cy.get('.cdk-row .cdk-column-eform span').eq(0).should('have.text', task.eformName + ' (11)');
149+
cy.get('.cdk-row .cdk-column-eform span').eq(1).should('have.text', task.eformName + ' (11)');
150150
cy.get('.cdk-row .cdk-column-startDate span').eq(0)
151151
.should('have.text', `${task.startFrom.day}.${task.startFrom.month >= 10 ? '' : '0'}${task.startFrom.month}.${task.startFrom.year}`);
152152
cy.get('.cdk-row .cdk-column-startDate span').eq(1)
@@ -177,8 +177,8 @@ describe('Area rules type 1', () => {
177177
cy.get('.cdk-row .cdk-column-taskName span').eq(0).should('have.text', task.translations[0]);
178178
cy.get('.cdk-row .cdk-column-taskName span').eq(1).should('have.text', task.translations[0]);
179179
cy.get('.cdk-row .cdk-column-taskName span').eq(2).should('have.text', task.translations[0]);
180-
cy.get('.cdk-row .cdk-column-eform span').eq(0).should('have.text', task.eformName + ' (9)');
181-
cy.get('.cdk-row .cdk-column-eform span').eq(1).should('have.text', task.eformName + ' (9)');
180+
cy.get('.cdk-row .cdk-column-eform span').eq(0).should('have.text', task.eformName + ' (11)');
181+
cy.get('.cdk-row .cdk-column-eform span').eq(1).should('have.text', task.eformName + ' (11)');
182182
cy.get('.cdk-row .cdk-column-eform span').eq(2).should('have.text', editedTask.eformName + ' (3)');
183183
});
184184
after(() => {

‎eform-client/cypress/e2e/plugins/backend-configuration-pn/g/task-wizard.edit-assignment.spec.cy.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ describe('Area rules type 1', () => {
127127
cy.get('.cdk-row .cdk-column-property span').should('have.text', task.property);
128128
cy.get('.cdk-row .cdk-column-folder span').should('have.text', '00. Logbøger');
129129
cy.get('.cdk-row .cdk-column-taskName span').should('have.text', task.translations[0]);
130-
cy.get('.cdk-row .cdk-column-eform span').should('have.text', task.eformName + ' (9)');
130+
cy.get('.cdk-row .cdk-column-eform span').should('have.text', task.eformName + ' (11)');
131131
cy.get('.cdk-row .cdk-column-startDate span')
132132
.should('have.text', `${task.startFrom.day}.${task.startFrom.month >= 10 ? '' : '0'}${task.startFrom.month}.${task.startFrom.year}`);
133133
cy.get('.cdk-row .cdk-column-repeat span').should('have.text', `${task.repeatEvery} ${task.repeatType}`);

‎eform-client/cypress/e2e/plugins/backend-configuration-pn/g/task-wizard.edit-frequency.spec.cy.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ describe('Area rules type 1', () => {
125125
cy.get('.cdk-row .cdk-column-property span').should('have.text', task.property);
126126
cy.get('.cdk-row .cdk-column-folder span').should('have.text', '00. Logbøger');
127127
cy.get('.cdk-row .cdk-column-taskName span').should('have.text', task.translations[0]);
128-
cy.get('.cdk-row .cdk-column-eform span').should('have.text', task.eformName + ' (9)');
128+
cy.get('.cdk-row .cdk-column-eform span').should('have.text', task.eformName + ' (11)');
129129
cy.get('.cdk-row .cdk-column-startDate span')
130130
.should('have.text', `${task.startFrom.day}.${task.startFrom.month >= 10 ? '' : '0'}${task.startFrom.month}.${task.startFrom.year}`);
131131
cy.get('.cdk-row .cdk-column-repeat span').should('have.text', `${task.repeatEvery} ${task.repeatType}`);
@@ -161,7 +161,7 @@ describe('Area rules type 1', () => {
161161
cy.get('.cdk-row .cdk-column-property span').should('have.text', task.property);
162162
cy.get('.cdk-row .cdk-column-folder span').should('have.text', '00. Logbøger');
163163
cy.get('.cdk-row .cdk-column-taskName span').should('have.text', task.translations[0]);
164-
cy.get('.cdk-row .cdk-column-eform span').should('have.text', task.eformName + ' (9)');
164+
cy.get('.cdk-row .cdk-column-eform span').should('have.text', task.eformName + ' (11)');
165165
cy.get('.cdk-row .cdk-column-startDate span')
166166
.should('have.text', `${task.startFrom.day}.${task.startFrom.month >= 10 ? '' : '0'}${task.startFrom.month}.${task.startFrom.year}`);
167167
cy.get('.cdk-row .cdk-column-repeat span').should('have.text', `${task.repeatEvery} ${task.repeatType}`);

‎eform-client/cypress/e2e/plugins/backend-configuration-pn/g/task-wizard.edit.spec.cy.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ describe('Area rules type 1', () => {
125125
cy.get('.cdk-row .cdk-column-property span').should('have.text', task.property);
126126
cy.get('.cdk-row .cdk-column-folder span').should('have.text', '00. Logbøger');
127127
cy.get('.cdk-row .cdk-column-taskName span').should('have.text', task.translations[0]);
128-
cy.get('.cdk-row .cdk-column-eform span').should('have.text', task.eformName + ' (9)');
128+
cy.get('.cdk-row .cdk-column-eform span').should('have.text', task.eformName + ' (11)');
129129
cy.get('.cdk-row .cdk-column-startDate span')
130130
.should('have.text', `${task.startFrom.day}.${task.startFrom.month >= 10 ? '' : '0'}${task.startFrom.month}.${task.startFrom.year}`);
131131
cy.get('.cdk-row .cdk-column-repeat span').should('have.text', `${task.repeatEvery} ${task.repeatType}`);
@@ -159,7 +159,7 @@ describe('Area rules type 1', () => {
159159
cy.get('.cdk-row .cdk-column-property span').should('have.text', task.property);
160160
cy.get('.cdk-row .cdk-column-folder span').should('have.text', '00. Logbøger');
161161
cy.get('.cdk-row .cdk-column-taskName span').should('have.text', task.translations[0]);
162-
cy.get('.cdk-row .cdk-column-eform span').should('have.text', task.eformName + ' (9)');
162+
cy.get('.cdk-row .cdk-column-eform span').should('have.text', task.eformName + ' (11)');
163163
cy.get('.cdk-row .cdk-column-startDate span')
164164
.should('have.text', `${task.startFrom.day}.${task.startFrom.month >= 10 ? '' : '0'}${task.startFrom.month}.${task.startFrom.year}`);
165165
cy.get('.cdk-row .cdk-column-repeat span').should('have.text', `${task.repeatEvery} ${task.repeatType}`);

0 commit comments

Comments
 (0)