Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

C2026-027-New-Set_At_All_Level-in-the-Applicability-tab-evaluate-having-the-button-grayed-out-for-the-RNO-column-3 #760

Merged
jjenko merged 4 commits from C2026-027-New-Set_At_All_Level-in-the-Applicability-tab-evaluate-having-the-button-grayed-out-for-the-RNO-column-3 into Development 2026-04-30 08:41:02 -04:00
Conversation 5 Commits 4 Files Changed 2
+20 -2
plarsen commented 2026-04-28 18:23:42 -04:00
Owner
Copy Link
Copy Source

C2026-027 & C2026-028 -Set_At_All_Level button in the Applicability tab evaluates having the button grayed out for the RNO column.

C2026-027 & C2026-028 -Set_At_All_Level button in the Applicability tab evaluates having the button grayed out for the RNO column.
C2026-027-New-Set_At_All_Level-in-the-Applicability-tab-evaluate-having-the-button-grayed-out-for-the-RNO-column.docx
166 KiB
plarsen added 3 commits 2026-04-28 18:23:42 -04:00
Development 7273a8b13b
Merge remote-tracking branch 'origin/Development' into Development 03d7397242
C2026-027-New-Set_At_All_Level-in-the-Applicability-tab-evaluate-having-the-button-grayed-out-for-the-RNO-column-3 b321bc354b
plarsen self-assigned this 2026-04-28 18:24:20 -04:00
djankowski was assigned by plarsen 2026-04-28 18:24:22 -04:00
jjenko was assigned by plarsen 2026-04-28 18:24:22 -04:00
mvickers was assigned by plarsen 2026-04-28 18:24:28 -04:00
plarsen requested review from jjenko 2026-04-28 18:24:45 -04:00
mschill requested changes 2026-04-29 06:21:32 -04:00
Dismissed
mschill left a comment
Owner
Copy Link
Copy Source

It looks like there were 2 files that were changed that shouldn't have been - frmVEPROMS.cs & ItemExt.cs.

Other than that - looks good - so once those 2 are reverted, should be good.

It looks like there were 2 files that were changed that shouldn't have been - frmVEPROMS.cs & ItemExt.cs. Other than that - looks good - so once those 2 are reverted, should be good.
PROMS/VEPROMS User Interface/frmVEPROMS.cs
@@ -11,7 +11,6 @@ using System.IO;
using System.Configuration;
using System.Reflection;
using VEPROMS.CSLA.Library;
mschill commented 2026-04-29 06:19:57 -04:00
Owner
Copy Link
Copy Source

Just checking? --- why was this file changed?

Just checking? --- why was this file changed?
plarsen commented 2026-04-29 09:09:41 -04:00
Author
Owner
Copy Link
Copy Source

For frmVEPROMS.cs I removed a commented out using statement that was left over from the RO Symbols project. Line 13

For frmVEPROMS.cs I removed a commented out using statement that was left over from the RO Symbols project. Line 13
PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
@@ -9241,3 +9241,4 @@ namespace VEPROMS.CSLA.Library
Everything = 2
}
}
mschill commented 2026-04-29 06:20:05 -04:00
Owner
Copy Link
Copy Source

Just checking? --- why was this file changed?

Just checking? --- why was this file changed?
plarsen commented 2026-04-29 09:06:13 -04:00
Author
Owner
Copy Link
Copy Source

The first push I did the pull request was out of sync with dev. You had pushed the checkoff fix into dev just before I pushed the Set All At Level button changes. I need to get the latest file (ItemExt.cs) that was changed into my branch so my push would be in sync. After I added the latest version of ItemExt.cs to my branch the push was up to date. I checked the dev version to my branch version of ItemExt.cs and they were the same.

The first push I did the pull request was out of sync with dev. You had pushed the checkoff fix into dev just before I pushed the Set All At Level button changes. I need to get the latest file (ItemExt.cs) that was changed into my branch so my push would be in sync. After I added the latest version of ItemExt.cs to my branch the push was up to date. I checked the dev version to my branch version of ItemExt.cs and they were the same.
mschill commented 2026-04-29 09:26:26 -04:00
Owner
Copy Link
Copy Source

per below - there is the addition of an extra line.

I know it may seem like overkill ---- but frmVEPROMS & ItemExt have other pending changes like the ones in this pull request:

https://git.volian.com/Volian/SourceCode/pulls/756/files

As such, unneeded changes set these files up for merge conflicts once other requests are merged into Dev branch,

As such, my recommendation would be to download the latest of these files from the Dev branch locally then pushing those to this branch to avoid problems in the GIT repo in the future / possible extra future work --- that being said, ultimately, this would be John/Devin's decision.

If assistance is needed, I am happy to help as I would much rather spend 5-10 minutes now as opposed to several hours later doing cleanup and manually clearing conflicts.

per below - there is the addition of an extra line. I know it may seem like overkill ---- but frmVEPROMS & ItemExt have other pending changes like the ones in this pull request: https://git.volian.com/Volian/SourceCode/pulls/756/files As such, unneeded changes set these files up for merge conflicts once other requests are merged into Dev branch, As such, my recommendation would be to download the latest of these files from the Dev branch locally then pushing those to this branch to avoid problems in the GIT repo in the future / possible extra future work --- that being said, ultimately, this would be John/Devin's decision. If assistance is needed, I am happy to help as I would much rather spend 5-10 minutes now as opposed to several hours later doing cleanup and manually clearing conflicts.
plarsen commented 2026-04-29 09:51:48 -04:00
Author
Owner
Copy Link
Copy Source

That is what I did with ItemExt.cs. I grabbed the dev version and added it to my branch. frmVEPROMS.cs in dev is identical to the one in my branch except the removed using statement. So, I would think there would be no merge conflicts.

That is what I did with ItemExt.cs. I grabbed the dev version and added it to my branch. frmVEPROMS.cs in dev is identical to the one in my branch except the removed using statement. So, I would think there would be no merge conflicts.
jjenko commented 2026-04-29 11:01:14 -04:00
Owner
Copy Link
Copy Source

All-in-all, if there are no changes compared to the development version, this file should not be checked in. we can check into this tomorrow when we are in the offcie.

All-in-all, if there are no changes compared to the development version, this file should not be checked in. we can check into this tomorrow when we are in the offcie.
mschill requested changes 2026-04-29 10:54:27 -04:00
Dismissed
mschill left a comment
Owner
Copy Link
Copy Source

Also in the designer --- Just to check --- is this wording accurate? ----- i.e. if this is ran on a high level step wouldn't it update all high level steps in that procedure (not sub-steps)?

Also in the designer --- Just to check --- is this wording accurate? ----- i.e. if this is ran on a high level step wouldn't it update all high level steps in that procedure (not sub-steps)?
PROMS/Volian.Controls.Library/DisplayApplicability.Designer.cs Outdated
@@ -50,3 +50,3 @@
this.btnApplicabilitychg.Margin = new System.Windows.Forms.Padding(2);
this.btnApplicabilitychg.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.superTooltip1.SetSuperTooltip(this.btnApplicabilitychg, new DevComponents.DotNetBar.SuperTooltipInfo("Change applicability settings - All At Level", "", "When clicked, all steps at the level of the current step will have their applicability settings changed. Note that for two column procedures, the left column and right column are handled separately.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
this.superTooltip1.SetSuperTooltip(this.btnApplicabilitychg, new DevComponents.DotNetBar.SuperTooltipInfo("Change applicability settings - All At Level", "", "When clicked, all sub-steps at that level of the current step will be set to the selected applicability. Note that this button is disabled when on a RNO step type but enabled for sub-step under it.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
mschill commented 2026-04-29 09:43:37 -04:00
Owner
Copy Link
Copy Source

Just to check --- is this wording accurate? ----- i.e. if this is ran on a high level step wouldn't it update all high level steps in that procedure (not sub-steps)?

Just to check --- is this wording accurate? ----- i.e. if this is ran on a high level step wouldn't it update all high level steps in that procedure (not sub-steps)?
jjenko commented 2026-04-29 10:57:42 -04:00
Owner
Copy Link
Copy Source

My bad. I didn't realize that it worked the same at the high level step level.
Please change the first part of the tool-top to:
"When clicked, all steps at that level will be set to the ....."

My bad. I didn't realize that it worked the same at the high level step level. Please change the first part of the tool-top to: "When clicked, all steps at that level will be set to the ....."
plarsen commented 2026-04-29 11:00:17 -04:00
Author
Owner
Copy Link
Copy Source

I will update the tool tip text. Thanks John.

I will update the tool tip text. Thanks John.
plarsen added 1 commit 2026-04-30 08:18:15 -04:00
C2026-027-New-Set_At_All_Level-in-the-Applicability-tab-evaluate-having-the-button-grayed-out-for-the-RNO-column-3 123b1b08c2
mschill approved these changes 2026-04-30 08:24:17 -04:00
mschill left a comment
Owner
Copy Link
Copy Source

Looks good to me. Ready for QA.

Looks good to me. Ready for QA.
jjenko approved these changes 2026-04-30 08:40:50 -04:00
jjenko left a comment
Owner
Copy Link
Copy Source

looks good

looks good
jjenko merged commit 652e0cb06f into Development 2026-04-30 08:41:02 -04:00
mvickers commented 2026-04-30 23:04:49 -04:00
Member
Copy Link
Copy Source

C2026-027 was tested and works as expected. C2026-028 was previously closed by Matt in March, but the tooltip was again updated as part of C2026-027. While the functionality tested as expected, the tooltip does need some edits and a new CSM item will be submitted by me on 5/1/26. I modified the testing requirements.

C2026-027 was tested and works as expected. C2026-028 was previously closed by Matt in March, but the tooltip was again updated as part of C2026-027. While the functionality tested as expected, the tooltip does need some edits and a new CSM item will be submitted by me on 5/1/26. I modified the testing requirements.
C2026-027 MRV Updated April 30 2026.docx
166 KiB
Sign in to join this conversation.
Reviewers
No Reviewers
mschill
jjenko
Labels
No items
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
djankowski (Devin Jankowski) jjenko (John Jenko) lbutler (Lydia Butler) mschill (Matthew Schill) mvickers (Michelle Vickers) plarsen (Paul Larsen)
No Assignees plarsen djankowski jjenko mvickers
4 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: Volian/SourceCode#760
Delete Branch "C2026-027-New-Set_At_All_Level-in-the-Applicability-tab-evaluate-having-the-button-grayed-out-for-the-RNO-column-3"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?