Compare commits

..

148 Commits

Author SHA1 Message Date
Kevin Laskey
4e24eed202 UI work and preliminary work on delete process for folders and UI for annotations 2024-06-21 15:46:22 -04:00
d0474b22f9 Merge pull request 'C2022-029 - Export Single Procedure (Overwrite/Rename/Cancel)' (#341) from C2022-029 into Development
passed code review. ready for testing phase
2024-06-20 10:02:52 -04:00
5bd1f94be0 Merge pull request 'C2024-004' (#339) from C2024-004 into Development
code changes look good. ready for testing phase.
2024-06-19 14:12:03 -04:00
Kevin Laskey
629fe1b615 Updated to include passing teh selected tree node parent for cases where the only procedure in a folder is being replaced. otherwise i pass null for that as its not really used. 2024-06-19 13:50:52 -04:00
Kevin Laskey
c92b888ec2 Update to close the procedure when opened during the paste/replace option. 2024-06-18 10:48:28 -04:00
5df42daa71 Merge pull request 'C2019-047' (#337) from C2019-047 into Development
changes approved.  Ready for testing phase
2024-06-14 13:24:51 -04:00
Kevin Laskey
9349396d9a Updates to display tags page for inital load of RO images and other images, updates to set some pre values for resizing and ratios. 2024-06-14 11:46:08 -04:00
Kevin Laskey
38425a05f9 Updates to pass through image details to the tag setting. 2024-06-13 15:14:35 -04:00
Kevin Laskey
9d1b99b08e Update 2024-06-13 09:00:49 -04:00
Kevin Laskey
4f7a762bf1 Updated to use modified date, shortened code a bit. 2024-06-13 08:35:13 -04:00
Kevin Laskey
11cb2e0efd Updated message 2024-06-07 15:14:33 -04:00
78f58bea19 Merge pull request 'C2019-047 - Show figure size under tags when adding a new figure.' (#336) from C2019-047 into Development
changes are good. ready for testing phase.
2024-06-07 15:04:14 -04:00
Kevin Laskey
a2e830d0c3 Update for "cancel" button action 2024-06-07 14:42:26 -04:00
Kevin Laskey
2ffab17caf Updates for adding custom buttons 2024-06-07 14:17:43 -04:00
Kevin Laskey
49aba5c67b update 2024-06-07 10:34:46 -04:00
1b24177b68 Merge pull request 'B2024-036 - Removed Print button from V Menu' (#334) from B2024-036 into Development
Code changes look good.  OK to generate test exe.
2024-06-06 08:59:41 -04:00
bf7a967633 Merge pull request 'F2024-063 Beaver Valley requested that the section number be underlined at the top of the pages of the Two Column Attachment section and an extra space was added between the top continue message and first line of step text on that page.' (#333) from F2024-063_BeaverValley into Development
format only change. OK to move to testing phase.
2024-06-05 16:26:57 -04:00
f5669e50a8 F2024-063 Beaver Valley requested that the section number be underlined at the top of the pages of the Two Column Attachment section and an extra space was added between the top continue message and first line of step text on that page. 2024-06-05 16:27:08 -04:00
Kevin Laskey
2ae0d0d454 Update to ensure some size is presetned for the figure when adding a new. 2024-06-05 10:48:51 -04:00
Kevin Laskey
241785846e Update for displaying when a figure is selected or added (as opposed to a step or some other type of option) 2024-06-04 11:55:17 -04:00
Kevin Laskey
0d6fd6950c C2019-047 - Show the figure size adjustment panel before a figure is selected or inserted, so that they dont have to open/close the area to see it. 2024-06-04 09:18:58 -04:00
Kevin Laskey
bb99d6444c B2024-036 - Removed Print button from V Menu 2024-06-04 09:05:22 -04:00
Kevin Laskey
db4f114caf C2022-029 - Export Import changes, Set path automatically for single proc export, provide overwrite message on single prompt export. 2024-06-04 08:51:57 -04:00
80d83da9c9 Merge pull request 'B2024-035-Overwrite-settings.' (#331) from B2024-035 into Development
OK to generate test exe.
2024-05-29 16:56:39 -04:00
54e02e6263 B2024-035-Overwrite-settings. 2024-05-29 15:30:25 -04:00
c4af911f15 Merge pull request 'F2024-062 Removed the Unit number that was mistakenly added to the procedure steps section header.' (#330) from F2024-062_BNPP into Development
format only change.
2024-05-23 14:20:46 -04:00
f9690ee772 F2024-062 Removed the Unit number that was mistakenly added to the procedure steps section header. 2024-05-23 14:19:14 -04:00
623c6a7941 Merge pull request 'B2024-034 Fix "Overwrite PDF File" functionality in Print Dialog Box' (#329) from B2024-034 into Development
passed code review and ready for testing
2024-05-22 16:09:56 -04:00
7a5129208c B2024-034 Fix Overwrite PDF File. 2024-05-22 16:08:12 -04:00
e15c56f1e2 Merge pull request 'B2024-023: UI fixes for insert section with associated enhanced section' (#328) from B2024-023 into Development
ready to be tested
2024-05-22 09:04:55 -04:00
Kathy Ruffing
5d808e436a B2024-023: UI fixes for insert section with associated enhanced section 2024-05-22 08:51:22 -04:00
20e40a5c49 Merge pull request 'F2024-061 Added an AOP Deviation format for Beaver Valley.' (#326) from F2024-061 into Development
format only change
2024-05-20 10:57:51 -04:00
885dae812d F2024-061 Added an AOP Deviation format for Beaver Valley. 2024-05-20 10:56:13 -04:00
35bd91f7e8 Merge pull request 'F2024-060 For the Byron and Braidwood formats, adjusted the text widths on the edit screen to be closer to that of which is printed.' (#324) from F2024-060_ByBwd_Bckgnd into Development
format only change
2024-05-16 14:58:23 -04:00
305f2768bb F2024-060 For the Byron and Braidwood formats, adjusted the text widths on the edit screen to be closer to that of which is printed. 2024-05-16 14:58:09 -04:00
5f733161c6 Merge pull request 'C2024-001-Update-Baseline-Auto-Testing' (#322) from C2024-011 into Development
passed code review
2024-05-16 11:44:32 -04:00
4fc13acd1a Merge pull request 'B2024-030 On the Working Draft properties page, added a check to see if we need to create the folder(s) for the path typed into the PDF Location text box.' (#320) from B2024-030_SetOuptputPath into Development
Reviewed-on: #320
2024-05-14 15:41:41 -04:00
365f6a23c8 B2024-030 On the Working Draft properties page, added a check to see if we need to create the folder(s) for the path typed into the PDF Location text box. 2024-05-14 14:24:01 -04:00
331d5751c3 C2024-001-Update-Baseline-Auto-Testing 2024-05-14 11:41:45 -04:00
dfb965edbc Merge pull request 'B2024-028 consistent paste menuing in enhanced set' (#319) from B2024-028 into Development
good to test
2024-05-14 10:20:00 -04:00
Kathy Ruffing
c7cc69fd73 B2024-028 consistent paste menuing in enhanced set 2024-05-14 10:09:20 -04:00
d187aa885d Merge pull request 'B2024-032 Fix Click Quick Print' (#318) from B2024-032 into Development
code OK to be tested
2024-05-13 08:46:14 -04:00
b1b4535d9b B2024-032 Fix Click Quick Print 2024-05-12 16:42:24 -04:00
b085a727f0 Merge pull request 'B2024-031Fix for Transitions hyperlinks in PDFs' (#317) from B2024-031_PDF_HyperLinks_Fix into Development
Reviewed-on: #317
2024-05-10 07:46:43 -04:00
e548e1da63 B2024-031Fix for Transitions hyperlinks in PDFs 2024-05-09 16:47:52 -04:00
c320634d3d Merge pull request 'C2024-010' (#316) from C2024-010 into Development
OK to generate test executable
2024-05-09 15:25:55 -04:00
af889a8818 C2024-010 Add quick print to tabstepribbonReview 2024-05-09 14:10:16 -04:00
c265975cbe C2024-010 Add quick print to tabstepribbonReview 2024-05-08 17:32:06 -04:00
a41a398e7e Merge pull request 'B2024-026: page number transitions duplicate page number' (#314) from B2024-026 into Development
ready to build for testing
2024-05-08 13:53:13 -04:00
Kathy Ruffing
5edaf30601 B2024-026: page number transitions duplicate page number 2024-05-08 12:07:11 -04:00
df0c5259c0 Merge pull request 'C2024-007 When link information is created in a PDF during print, the link information includes the PDF file name of where the link is referencing. Logic was added to include any file prefix or suffix to the PDF file name that is saved in the link info…' (#313) from PDFLinks_Fix into Development
Reviewed-on: #313
2024-05-08 09:49:17 -04:00
10c25dbe44 C2024-007 When link information is created in a PDF during print, the link information includes the PDF file name of where the link is referencing. Logic was added to include any file prefix or suffix to the PDF file name that is saved in the link information so the Adobe can locate the file and open it when the use clicks on the link in the PDF. 2024-05-08 09:00:58 -04:00
2df37533a8 Merge pull request 'F2024-059 Customer requested an Asterisk Single Spaced List sub-step type. This was added to all Calaway formats' (#312) from F2024-059_Callaway into Development
format only changes
2024-05-07 16:07:55 -04:00
6392ee3f0f F2024-059 Customer requested an Asterisk Single Spaced List sub-step type. This was added to all Calaway formats 2024-05-07 16:00:36 -04:00
96ddce8b73 Merge pull request 'B2024-029 A newer version of Component One Flex Grid caused issues when creating a new table in PROMS. We are reverting back to the prior version of Flex Grid.' (#310) from GeneralDebugging into Development
no code review needed. Testing Source Control Document will satisfy QA.
2024-05-07 14:34:49 -04:00
c88caefe5d B2024-029 A newer version of Component One Flex Grid caused issues when creating a new table in PROMS. We are reverting back to the prior version of Flex Grid. 2024-05-07 14:32:57 -04:00
eb26b7a123 Merge pull request 'B2024-025 Older Parent/Child procedure sets use applicability tokens that do not include the “U-“ prefix.' (#309) from B2024-025_ApplicabilityTokens into Development
Reviewed-on: #309
2024-05-06 15:02:56 -04:00
c865b67398 B2024-025 Older Parent/Child procedure sets use applicability tokens that do not include the “U-“ prefix. 2024-05-06 13:49:03 -04:00
89814777b4 Merge pull request 'F2024-057 F2024-058 bullet symbom in ERG note, Allow the insert of sub-steps in Notes and Cautions' (#308) from GeneralDebugging into Development
format only change.
2024-04-26 16:21:23 -04:00
de7e2d5f2a F2024-057 F2024-058 bullet symbom in ERG note, Allow the insert of sub-steps in Notes and Cautions 2024-04-26 16:18:51 -04:00
f51866236f Merge pull request 'B2024-024 - Fixes issue when creating an Approved procedure import file (from Versions context menu) from a non-Parent/Child procedure set.' (#306) from GeneralDebugging into Development
Reviewed-on: #306
2024-04-26 10:08:30 -04:00
a9eec83382 B2024-024 - Fixes issue when creating an Approved procedure import file (from Versions context menu) from a non-Parent/Child procedure set. 2024-04-25 16:32:20 -04:00
fd5739bbcd Merge pull request 'C2023-006 Add time / eidt time to showing change bars.' (#305) from C2023-006 into Development
code review successful. OK to create test exe's
2024-04-24 14:06:47 -04:00
076e0bfe8e C2023-006 Add time / eidt time to showing change bars. 2024-04-24 13:41:15 -04:00
07d10c571b Merge pull request 'F2024-056 Centered the AND and OR separators in the PROMS User Manual single column format.' (#304) from GeneralDebugging into Development
format only change
2024-04-24 11:16:17 -04:00
20cbff0255 F2024-056 Centered the AND and OR separators in the PROMS User Manual single column format. 2024-04-24 11:15:31 -04:00
b643f7fdf8 Merge pull request 'F2024-054 F2024-055 Added a Dashed Double Spaced List and a Dashed Explicit OR sub-step type, Added "NO" to be underlined in ReplaceWords' (#303) from Vogtle3&4 into Development
format only changes.
2024-04-22 15:47:03 -04:00
0607fcf261 F2024-054 F2024-055 Added a Dashed Double Spaced List and a Dashed Explicit OR sub-step type, Added "NO" to be underlined in ReplaceWords 2024-04-22 15:43:31 -04:00
1289e52600 Merge pull request 'C2017-033 Remove text inserted for new step from V button' (#302) from C2017-033 into Development
ready to build for testing
2024-04-19 09:39:47 -04:00
fccc47483f C2017-033 Remove text inserted for new step from V button 2024-04-19 09:29:36 -04:00
5ffd99bd0e Merge pull request 'B2023-025: AER Ro table displays too far to left' (#301) from B2023-025 into Development
Ok to build test exe
2024-04-18 08:42:37 -04:00
Kathy Ruffing
dffea37fad B2023-025: AER Ro table displays too far to left 2024-04-18 08:36:51 -04:00
811076d432 Merge pull request 'C2024-008 -Created a PROMS executable use .Net version 4.8.1' (#299) from dotnet4_8_1 into Development
just build settings - no code review needed.
2024-04-16 14:18:45 -04:00
1bdfb7d1e3 C2024-008 -Created a PROMS executable use .Net version 4.8.1
B2020-106 - Fixed insert of new symbols.
2024-04-16 14:16:40 -04:00
4a3ca1c074 Merge pull request 'C2024-007: Proms form font combo box debug mode displayed by command line arg in debug mode' (#298) from GenWork into Development
Ok to generate exes for testing
2024-04-16 08:40:07 -04:00
Kathy Ruffing
9d50f55f71 C2024-007: Proms form font combo box debug mode displayed by command line arg in debug mode 2024-04-16 08:13:33 -04:00
Kathy Ruffing
b8e8e80acb Merge pull request 'F2024-053: Robinson foldouts printing on Purpose & Attachment sections' (#296) from F2024-053 into Development
Formats: no review needed
2024-04-10 07:14:02 -04:00
Kathy Ruffing
c77320d4e7 F2024-053: Robinson foldouts printing on Purpose & Attachment sections 2024-04-10 07:05:50 -04:00
59bc3141e8 Merge pull request 'removed AssemblyInfo.cs from Git cached' (#294) from GeneralDebugging into Development
no testing needed.
2024-04-05 14:49:59 -04:00
dc73cc3a50 removed AssemblyInfo.cs from Git cached 2024-04-05 14:47:56 -04:00
1433f14a0b Merge pull request 'F2024-052 - Beaver Valley Two Column Format. Allow Notes and Cautions off of sub-steps.' (#293) from F2024-052_BeaverValley into Development
Format only change
2024-04-05 12:18:41 -04:00
6e3fc49517 F2024-052 - Beaver Valley Two Column Format. Allow Notes and Cautions off of sub-steps. 2024-04-05 12:17:14 -04:00
d0f7da7ef6 Merge pull request 'F2024-051 Generic EOP Format, page width of Attachment section' (#291) from F2024-051_GenericEOPFmt into Development
format only change
2024-04-05 09:48:27 -04:00
b0776fb8b7 F2024-051 Generic EOP Format, page width of Attachment section 2024-04-05 09:43:15 -04:00
cae3e2323d Merge pull request 'B2024-021' (#290) from B2024-021 into Development
Code change looks good
2024-04-04 16:34:56 -04:00
ce8497e61f Merge pull request 'F2024-049 F2024-050 Generic EOP Format updates' (#289) from F2024-049_050_ERGFormat into Development
Reviewed-on: #289
2024-04-04 16:12:00 -04:00
72eaac478f B2024-021 2024-04-04 15:45:44 -04:00
776d9891d9 F2024-049 F2024-050 Generic EOP Format updates 2024-04-04 15:36:15 -04:00
Kathy Ruffing
6e37911462 Merge pull request 'F2024-045: BGE format - note/sub-step table overwrites note line' (#288) from F2024-045 into Development
F2024-045: Calvert Format (BGEOI & BGESTP) – printed Note’s sub-step table extends beyond Note/Caution line
2024-04-04 11:46:13 -04:00
Kathy Ruffing
d2cad3a9f7 F2024-045: BGE format - note/sub-step table overwrites note line 2024-04-04 11:42:39 -04:00
3f94097f73 Merge pull request 'B2024-019 - BNPP - Allow the use to select a sub-step that has a bullet instead of a number/letter step tab, when using the {Step Text} transitions. Also don’t show any Tables in the tree view to select the step to link to.' (#286) from B2024-019_BNPP_StepTextTransition into Development
Reviewed-on: #286
2024-04-01 14:48:28 -04:00
e45422755f B2024-019 - BNPP - Allow the use to select a sub-step that has a bullet instead of a number/letter step tab, when using the {Step Text} transitions. Also don’t show any Tables in the tree view to select the step to link to. 2024-04-01 14:32:26 -04:00
09b5cb4be4 Merge pull request 'B2024-017-Fix-BNPP-Table-Arrows' (#285) from B2024-017 into Development
changes look good and ready for testing
2024-03-28 11:22:35 -04:00
50f18ff803 B2024-017-fix-BNPP-Table-Arrows 2024-03-28 10:50:41 -04:00
Kathy Ruffing
6c733d54fc Merge pull request 'F2024-048 - Robinson requested that we use a hard space in the page number part of transitions that include page numbers. Made this change generic because it doen't make sence to break a page number on to the next line all by itstelf.' (#284) from F2024-048-HardSpaceInTransPageNum into Development
Code review completed successfully
2024-03-28 09:29:44 -04:00
64bdb9fb76 B2024-017-Fix-BNPP-Table-Arrows 2024-03-28 09:03:03 -04:00
389a3013b5 F2024-048 - Robinson requested that we use a hard space in the page number part of transitions that include page numbers. Made this change generic because it doen't make sence to break a page number on to the next line all by itstelf. 2024-03-27 16:12:00 -04:00
21c2012c15 Merge pull request 'F2024-047 - Added (to all BNPP formats) a transition type that can be used to referenced procedure steps containing standard step text.' (#283) from F2024-047_BNPP_Transition_To_Text into Development
Reviewed-on: #283
2024-03-27 14:48:45 -04:00
e309c4a814 F2024-047 - Added (to all BNPP formats) a transition type that can be used to referenced procedure steps containing standard step text. 2024-03-27 14:29:09 -04:00
95a39e5a12 Merge pull request 'B2024-018: enhanced linking with subsections' (#281) from B2024-018 into Development
code review successful. OK to test.
2024-03-27 10:39:42 -04:00
Kathy Ruffing
2c587dd848 B2024-018: enhanced linking with subsections 2024-03-27 10:06:37 -04:00
07f67414a9 Merge pull request 'F2024-021 -Adjusted the page margins in the Vogtle 2 column format' (#280) from Vogtle3&4 into Development
Format only change.
2024-03-27 09:57:22 -04:00
da4cbfd112 F2024-021 -Adjusted the page margins in the Vogtle 2 column format 2024-03-27 09:50:33 -04:00
e392c1fcc7 Merge pull request 'F2024-030 - Fixed PC/PC procedure number in transitions so that only one appears.' (#279) from F2024-030_Vogtle3_4_PCTrans into Development
Reviewed-on: #279
2024-03-25 10:51:09 -04:00
eeacf9b969 F2024-030 - Fixed PC/PC procedure number in transitions so that only one appears. 2024-03-25 09:15:07 -04:00
cf13e2f7d5 Merge pull request 'F2024-046 - In Robinson format CPL, fixed transition {Section Number} {Page Num} so that it does not prompt saying you need to select a step.' (#278) from F2024-046-RobinsonTransition into Development
Format only change.
2024-03-22 15:23:11 -04:00
5db530f4e8 F2024-046 - In Robinson format CPL, fixed transition {Section Number} {Page Num} so that it does not prompt saying you need to select a step. 2024-03-22 15:22:28 -04:00
d42e8115ec Merge pull request 'B2023-110-Symbols-in-tables' (#277) from B2023-110 into Development
changes are good for testing.
2024-03-22 15:19:38 -04:00
4f68414a8a B2023-110-Symbols-in-tables 2024-03-22 12:56:36 -04:00
9fd9eac16a Merge pull request 'B2024-016 - For Robinson, all local transitions will now have the option of including a page number. Generic, transitions defined to never include a step number will not display a list of steps in the Transitions Step Properties panel' (#276) from GeneralDebugging into Development
Reviewed-on: #276
2024-03-22 10:10:21 -04:00
c4e3ba10c6 B2024-016 - For Robinson, all local transitions will now have the option of including a page number. Generic, transitions defined to never include a step number will not display a list of steps in the Transitions Step Properties panel 2024-03-22 09:19:59 -04:00
3c632d4abc Merge pull request 'Fixing CSLA references' (#274) from GeneralDebugging into Development
fixing build errors
2024-03-20 14:12:13 -04:00
ccb2bab805 Fixing CSLA references 2024-03-20 14:11:56 -04:00
a5a0d389e2 Merge pull request 'F2024-037 Adjustments made for single column sections of the Vogtle Units 3 & 4, including length of un-numbered HLS, resetting the sub-step numbering when staring under an un-numbered HLS, removed “Two Column” from the section type name Purpose an…' (#273) from Vogtle3&4 into Development
Reviewed-on: #273
2024-03-19 16:23:41 -04:00
97dbfad875 F2024-037 Adjustments made for single column sections of the Vogtle Units 3 & 4, including length of un-numbered HLS, resetting the sub-step numbering when staring under an un-numbered HLS, removed “Two Column” from the section type name Purpose and Symptoms Step Editor 2024-03-19 15:30:57 -04:00
Chris Glavan
51ef1d127d Merge pull request 'CSLA_version_upgrade' (#272) from CSLA_version_upgrade into Development
Merging into Development.

**NOTE**
Developers will need to update their 3rd Party Library repository to ensure that they have the latest CSLA version.  Review the Git documentation in Confluence for instructions on cloning the repository.
2024-03-19 12:01:54 -04:00
Chris Glavan
31301c4717 ~Added CSLA v3.8.4 library 2024-03-19 11:21:21 -04:00
Chris Glavan
b01a9edc1e ~Upgraded CSLA library to v3.0.5 2024-03-18 11:42:04 -04:00
ac1041fa10 Merge pull request 'F2024-040 Fixed the Single Spaced Paragraph sub-step type and removed the duplicated one.' (#270) from Vogtle3&4 into Development
format only changes
2024-03-15 10:09:59 -04:00
f7a692248e F2024-044 Underline the Note tabs in the Commanche Peak ERG format. 2024-03-15 10:07:10 -04:00
49500f0926 Merge pull request 'F2024-044 Underline the Note tabs in the Commanche Peak ERG format.' (#268) from F2023-044_ComanchePeakNoteTab into Development
format only change
2024-03-14 14:01:06 -04:00
77cf0f09b4 F2024-044 Underline the Note tabs in the Commanche Peak ERG format. 2024-03-14 14:00:57 -04:00
Kathy Ruffing
4292581840 Merge pull request 'F2024-043 Corrected box around second level continuous action sub-step.' (#267) from Vogtle3&4 into Development
Code review completed successfully.
2024-03-14 06:49:06 -04:00
d9018c44e7 F2024-043 Corrected box around second level continuous action sub-step. 2024-03-13 16:32:27 -04:00
490c61c225 Merge pull request 'F2024-019 Put box around Continuous Action Sub-Step tab.' (#266) from Vogtle3&4 into Development
format only changes
2024-03-13 08:37:06 -04:00
021bcb3c65 F2024-019 Put box around Continuous Action Sub-Step tab. 2024-03-13 08:36:48 -04:00
8e433cc28e Merge pull request 'F2024-016 Remove column headers from Attachment – Word Section.' (#264) from Vogtle3&4 into Development
Format only change
2024-03-12 10:22:12 -04:00
33972bed19 F2024-016 Remove column headers from Attachment – Word Section. 2024-03-12 10:21:57 -04:00
Kathy Ruffing
ed65bded13 Merge pull request 'F2024-032: Robinson page number transitions in format' (#263) from F2024-032 into Development
Robinson Format (CPL & CPLA) – add section number/title page number transition support
2024-03-07 10:19:25 -05:00
Kathy Ruffing
c5e145e4f6 F2024-032: Robinson page number transitions in format 2024-03-07 10:16:39 -05:00
2c4a8a79ee Merge pull request 'F2024-027 & F2024-028 - Top continue message logic for Vogtle Units3&4 local Alarms Attachment sections' (#262) from Vogtle3&4 into Development
Reviewed-on: #262
2024-03-06 14:22:51 -05:00
42180012fe F2024-027 & F2024-028 - Top continue message logic for Vogtle Units3&4 local Alarms Attachment sections 2024-03-06 13:57:38 -05:00
00268c8fac Merge pull request 'Vogtle3&4' (#261) from Vogtle3&4 into Development
Format only change
2024-03-05 11:23:06 -05:00
eabfcf7b82 F2024-025 - Added a new Front Matter section that include the end message “END OF PROCEDURE TEXT”. 2024-03-05 11:23:26 -05:00
264b444464 Merge branch 'Development' into Vogtle3&4 2024-03-05 11:04:36 -05:00
Kathy Ruffing
b1efb03958 Merge pull request 'B2024-013 - Fixed issue where hard returns are replaced with semi-colons in section titles in Automatic Table of Contents and will use the hard return when printing the section title for Vogtle’s Units 3 & 4 formats.' (#257) from Vogtle3&4 into Development
Code review completed successfully
2024-03-05 10:59:07 -05:00
821ce21e24 Merge branch 'Development' into Vogtle3&4 2024-03-05 09:14:58 -05:00
Chris Glavan
02b0fa9b6d Merge pull request '~Added bolding to HLS in the AER and RNO' (#260) from F2024-034 into Development
Merging into Development.  No code review needed due to formats being under development.
2024-03-05 08:58:20 -05:00
Chris Glavan
315a897444 ~Added bolding to HLS in the AER and RNO 2024-03-05 08:57:08 -05:00
820f82e977 Merge branch 'Development' into Vogtle3&4 2024-03-04 14:10:08 -05:00
126eff7614 Merge pull request 'B2024-014 - Fixed issue where Bulleted High Level Step and Dashed Explicit And steps were missing from the step and sub-step list' (#258) from B2024-014_Westinghouse_BulletStep into Development
format only change
2024-03-04 14:04:36 -05:00
82eeaeb351 B2024-014 - Fixed issue where Bulleted High Level Step and Dashed Explicit And steps were missing from the step and sub-step list 2024-03-04 14:04:22 -05:00
78f83eb2a5 B2024-013 - Fixed issue where hard returns are replaced with semi-colons in section titles in Automatic Table of Contents and will use the hard return when printing the section title for Vogtle’s Units 3 & 4 formats. 2024-03-04 10:40:10 -05:00
Chris Glavan
e38a706931 Merge pull request '~Removed previous edits and added "Dashed Equipment List" type' (#255) from F2024-020 into Development
Merged into Development.  No code review needed since formats are under development.
2024-02-29 11:25:30 -05:00
Chris Glavan
8a8507395f ~Removed previous edits and added "Dashed Equipment List" type 2024-02-29 11:25:52 -05:00
Chris Glavan
e0faa6403f Merge pull request 'F2024-020' (#254) from F2024-020 into Development
Merging into Development.  No code review needed since formats are under development.
2024-02-29 10:43:51 -05:00
Chris Glavan
88391824eb ~Re-committing after merge conflict 2024-02-29 10:43:05 -05:00
Chris Glavan
b6f1c9cdb5 ~Added a Dashed Single Spaced List to the VEGP2 format 2024-02-29 10:35:53 -05:00
134 changed files with 3244 additions and 19306 deletions

View File

@@ -27,7 +27,7 @@
</SccAuxPath> </SccAuxPath>
<SccProvider> <SccProvider>
</SccProvider> </SccProvider>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<FileUpgradeFlags> <FileUpgradeFlags>
</FileUpgradeFlags> </FileUpgradeFlags>
<UpgradeBackupLocation> <UpgradeBackupLocation>

View File

@@ -32,9 +32,9 @@ namespace AdjustBuildRevision
{ {
// Allow for setting build revision on either proms or the roeditor: // Allow for setting build revision on either proms or the roeditor:
if (Directory.GetCurrentDirectory().ToUpper().Contains("REFOBJ")) if (Directory.GetCurrentDirectory().ToUpper().Contains("REFOBJ"))
outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.2.yyMM.dHH") + "\")"); outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.3.yyMM.dHH") + "\")");
else else
outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.1.yyMM.dHH") + "\")"); outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.2.yyMM.dHH") + "\")");
// if (outline != line) // if (outline != line)
// { // {
// Console.WriteLine("Before: '{0}'", line); // Console.WriteLine("Before: '{0}'", line);

View File

@@ -1,3 +1,3 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration> <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup></configuration>

View File

@@ -6,7 +6,7 @@
</sectionGroup> </sectionGroup>
</configSections> </configSections>
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/>
</startup> </startup>
<userSettings> <userSettings>
<Baseline.Properties.Settings> <Baseline.Properties.Settings>

View File

@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Baseline</RootNamespace> <RootNamespace>Baseline</RootNamespace>
<AssemblyName>Baseline</AssemblyName> <AssemblyName>Baseline</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<SccProjectName> <SccProjectName>
</SccProjectName> </SccProjectName>

View File

@@ -18,7 +18,7 @@
</SccAuxPath> </SccAuxPath>
<SccProvider> <SccProvider>
</SccProvider> </SccProvider>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<FileUpgradeFlags> <FileUpgradeFlags>
</FileUpgradeFlags> </FileUpgradeFlags>
<UpgradeBackupLocation> <UpgradeBackupLocation>

View File

@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>FlexableMessageBox</RootNamespace> <RootNamespace>FlexableMessageBox</RootNamespace>
<AssemblyName>FlexableMessageBox</AssemblyName> <AssemblyName>FlexableMessageBox</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
<SccProjectName> <SccProjectName>

View File

@@ -241,6 +241,21 @@ namespace JR.Utils.GUI.Forms
return FlexibleMessageBoxForm.Show(owner, text, caption, buttons, icon, defaultButton); return FlexibleMessageBoxForm.Show(owner, text, caption, buttons, icon, defaultButton);
} }
/// <summary>
/// Shows the specified message box.
/// </summary>
/// <param name="owner">The owner.</param>
/// <param name="text">The text.</param>
/// <param name="caption">The caption.</param>
/// <param name="buttons">The buttons.</param>
/// <param name="icon">The icon.</param>
/// <param name="defaultButton">The default button.</param>
/// <returns>The dialog result.</returns>
public static DialogResult ShowCustom(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon)
{
return FlexibleMessageBoxForm.ShowCustom(null, text, caption, buttons, icon);
}
#endregion #endregion
#region Internal form class #region Internal form class
@@ -420,15 +435,15 @@ namespace JR.Utils.GUI.Forms
private static readonly String STANDARD_MESSAGEBOX_SEPARATOR_SPACES = " "; private static readonly String STANDARD_MESSAGEBOX_SEPARATOR_SPACES = " ";
//These are the possible buttons (in a standard MessageBox) //These are the possible buttons (in a standard MessageBox)
private enum ButtonID { OK = 0, CANCEL, YES, NO, ABORT, RETRY, IGNORE }; private enum ButtonID { OK = 0, CANCEL, YES, NO, ABORT, RETRY, IGNORE, OVERWRITE, RENAME };
//These are the buttons texts for different languages. //These are the buttons texts for different languages.
//If you want to add a new language, add it here and in the GetButtonText-Function //If you want to add a new language, add it here and in the GetButtonText-Function
private enum TwoLetterISOLanguageID { en, de, es, it }; private enum TwoLetterISOLanguageID { en, de, es, it };
private static readonly String[] BUTTON_TEXTS_ENGLISH_EN = { "OK", "Cancel", "&Yes", "&No", "&Abort", "&Retry", "&Ignore" }; //Note: This is also the fallback language private static readonly String[] BUTTON_TEXTS_ENGLISH_EN = { "OK", "Cancel", "&Yes", "&No", "&Abort", "&Retry", "&Ignore", "&Overwrite", "&Rename" }; //Note: This is also the fallback language
private static readonly String[] BUTTON_TEXTS_GERMAN_DE = { "OK", "Abbrechen", "&Ja", "&Nein", "&Abbrechen", "&Wiederholen", "&Ignorieren" }; private static readonly String[] BUTTON_TEXTS_GERMAN_DE = { "OK", "Abbrechen", "&Ja", "&Nein", "&Abbrechen", "&Wiederholen", "&Ignorieren", "&Overwrite", "&Rename" };
private static readonly String[] BUTTON_TEXTS_SPANISH_ES = { "Aceptar", "Cancelar", "&Sí", "&No", "&Abortar", "&Reintentar", "&Ignorar" }; private static readonly String[] BUTTON_TEXTS_SPANISH_ES = { "Aceptar", "Cancelar", "&Sí", "&No", "&Abortar", "&Reintentar", "&Ignorar", "&Overwrite", "&Rename" };
private static readonly String[] BUTTON_TEXTS_ITALIAN_IT = { "OK", "Annulla", "&Sì", "&No", "&Interrompi", "&Riprova", "&Ignora" }; private static readonly String[] BUTTON_TEXTS_ITALIAN_IT = { "OK", "Annulla", "&Sì", "&No", "&Interrompi", "&Riprova", "&Ignora", "&Overwrite", "&Rename" };
#endregion #endregion
@@ -693,6 +708,7 @@ namespace JR.Utils.GUI.Forms
flexibleMessageBoxForm.CancelButton = flexibleMessageBoxForm.button3; flexibleMessageBoxForm.CancelButton = flexibleMessageBoxForm.button3;
break; break;
case MessageBoxButtons.OK: case MessageBoxButtons.OK:
default: default:
@@ -709,16 +725,38 @@ namespace JR.Utils.GUI.Forms
flexibleMessageBoxForm.defaultButton = defaultButton; flexibleMessageBoxForm.defaultButton = defaultButton;
} }
#endregion private static void SetDialogButtonsCustom(FlexibleMessageBoxForm flexibleMessageBoxForm)
{
flexibleMessageBoxForm.visibleButtonsCount = 3;
#region Private event handlers flexibleMessageBoxForm.button1.Visible = true;
flexibleMessageBoxForm.button1.Text = flexibleMessageBoxForm.GetButtonText(ButtonID.CANCEL);
flexibleMessageBoxForm.button1.DialogResult = DialogResult.Abort;
/// <summary> flexibleMessageBoxForm.button2.Visible = true;
/// Handles the Shown event of the FlexibleMessageBoxForm control. flexibleMessageBoxForm.button2.Text = flexibleMessageBoxForm.GetButtonText(ButtonID.OVERWRITE);
/// </summary> flexibleMessageBoxForm.button2.DialogResult = DialogResult.Retry;
/// <param name="sender">The source of the event.</param>
/// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param> flexibleMessageBoxForm.button3.Visible = true;
private void FlexibleMessageBoxForm_Shown(object sender, EventArgs e) flexibleMessageBoxForm.button3.Text = flexibleMessageBoxForm.GetButtonText(ButtonID.RENAME);
flexibleMessageBoxForm.button3.DialogResult = DialogResult.Ignore;
flexibleMessageBoxForm.ControlBox = false;
}
#endregion
#region Private event handlers
/// <summary>
/// Handles the Shown event of the FlexibleMessageBoxForm control.
/// </summary>
/// <param name="sender">The source of the event.</param>
/// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
private void FlexibleMessageBoxForm_Shown(object sender, EventArgs e)
{ {
int buttonIndexToFocus = 1; int buttonIndexToFocus = 1;
Button buttonToFocus; Button buttonToFocus;
@@ -866,6 +904,46 @@ namespace JR.Utils.GUI.Forms
return flexibleMessageBoxForm.ShowDialog(owner); return flexibleMessageBoxForm.ShowDialog(owner);
} }
/// <summary>
/// Shows the specified message box.
/// </summary>
/// <param name="owner">The owner.</param>
/// <param name="text">The text.</param>
/// <param name="caption">The caption.</param>
/// <param name="buttons">The buttons.</param>
/// <param name="icon">The icon.</param>
/// <param name="defaultButton">The default button.</param>
/// <returns>The dialog result.</returns>
public static DialogResult ShowCustom(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon)
{
//Create a new instance of the FlexibleMessageBox form
var flexibleMessageBoxForm = new FlexibleMessageBoxForm();
flexibleMessageBoxForm.ShowInTaskbar = false;
//Bind the caption and the message text
flexibleMessageBoxForm.CaptionText = caption;
flexibleMessageBoxForm.MessageText = text;
flexibleMessageBoxForm.FlexibleMessageBoxFormBindingSource.DataSource = flexibleMessageBoxForm;
//Set the buttons visibilities and texts. Also set a default button.
SetDialogButtonsCustom(flexibleMessageBoxForm);
//Set the dialogs icon. When no icon is used: Correct placement and width of rich text box.
SetDialogIcon(flexibleMessageBoxForm, icon);
//Set the font for all controls
flexibleMessageBoxForm.Font = FONT;
flexibleMessageBoxForm.richTextBoxMessage.Font = FONT;
//Calculate the dialogs start size (Try to auto-size width to show longest text row). Also set the maximum dialog size.
SetDialogSizes(flexibleMessageBoxForm, text, caption);
//Set the dialogs start position when given. Otherwise center the dialog on the current screen.
SetDialogStartPosition(flexibleMessageBoxForm, owner);
//Show the dialog
return flexibleMessageBoxForm.ShowDialog(owner);
}
#endregion #endregion
} //class FlexibleMessageBoxForm } //class FlexibleMessageBoxForm

View File

@@ -18,7 +18,7 @@
</SccAuxPath> </SccAuxPath>
<SccProvider> <SccProvider>
</SccProvider> </SccProvider>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<FileUpgradeFlags> <FileUpgradeFlags>
</FileUpgradeFlags> </FileUpgradeFlags>
<UpgradeBackupLocation> <UpgradeBackupLocation>
@@ -126,6 +126,7 @@
<Content Include="fmtall\BVPSAOPall.xml" /> <Content Include="fmtall\BVPSAOPall.xml" />
<Content Include="fmtall\BVPSAtchall.xml" /> <Content Include="fmtall\BVPSAtchall.xml" />
<Content Include="fmtall\BVPSBCKall.xml" /> <Content Include="fmtall\BVPSBCKall.xml" />
<Content Include="fmtall\BVPSAOPDEVall.xml" />
<Content Include="fmtall\BVPSFlexDEVall.xml" /> <Content Include="fmtall\BVPSFlexDEVall.xml" />
<Content Include="fmtall\BVPSDEVall.xml" /> <Content Include="fmtall\BVPSDEVall.xml" />
<Content Include="fmtall\BVPSNIBCKall.xml" /> <Content Include="fmtall\BVPSNIBCKall.xml" />
@@ -406,6 +407,7 @@
<Content Include="genmacall\BVPSAOP.svg" /> <Content Include="genmacall\BVPSAOP.svg" />
<Content Include="genmacall\BVPSAtch.svg" /> <Content Include="genmacall\BVPSAtch.svg" />
<Content Include="genmacall\BVPSbck.svg" /> <Content Include="genmacall\BVPSbck.svg" />
<Content Include="genmacall\BVPSAOPdev.svg" />
<Content Include="genmacall\BVPSFlexdev.svg" /> <Content Include="genmacall\BVPSFlexdev.svg" />
<Content Include="genmacall\BVPSdev.svg" /> <Content Include="genmacall\BVPSdev.svg" />
<Content Include="genmacall\BVPSNIBCK.svg" /> <Content Include="genmacall\BVPSNIBCK.svg" />

View File

@@ -1,3 +1,3 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration> <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup></configuration>

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -18,7 +18,7 @@
</SccAuxPath> </SccAuxPath>
<SccProvider> <SccProvider>
</SccProvider> </SccProvider>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<FileUpgradeFlags> <FileUpgradeFlags>
</FileUpgradeFlags> </FileUpgradeFlags>
<UpgradeBackupLocation> <UpgradeBackupLocation>

View File

@@ -33,7 +33,7 @@
</SccAuxPath> </SccAuxPath>
<SccProvider> <SccProvider>
</SccProvider> </SccProvider>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<OldToolsVersion>2.0</OldToolsVersion> <OldToolsVersion>2.0</OldToolsVersion>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>

View File

@@ -1,6 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<configuration> <configuration>
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup><runtime> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup><runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" appliesTo="v1.0.3705"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" appliesTo="v1.0.3705">
</assemblyBinding></runtime></configuration> </assemblyBinding></runtime></configuration>

View File

@@ -23,8 +23,8 @@ using System.Runtime.CompilerServices;
// Build YYMM (two digit year, two digit month) // Build YYMM (two digit year, two digit month)
// Revision DHH (day - no leading zero, two digit hour - military time // Revision DHH (day - no leading zero, two digit hour - military time
// //
[assembly: AssemblyVersion("2.2.2306.2212")] [assembly: AssemblyVersion("2.3.2404.1611")]
[assembly: AssemblyFileVersion("2.2.2306.2212")] [assembly: AssemblyFileVersion("2.3.2404.1611")]
// //
// In order to sign your assembly you must specify a key to use. Refer to the // In order to sign your assembly you must specify a key to use. Refer to the
@@ -89,6 +89,8 @@ using System.Runtime.CompilerServices;

View File

@@ -44,7 +44,7 @@
</SccAuxPath> </SccAuxPath>
<SccProvider> <SccProvider>
</SccProvider> </SccProvider>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<OldToolsVersion>2.0</OldToolsVersion> <OldToolsVersion>2.0</OldToolsVersion>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>

View File

@@ -1,7 +1,7 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<configuration> <configuration>
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup><runtime> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup><runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" appliesTo="v1.0.3705"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" appliesTo="v1.0.3705">
</assemblyBinding></runtime> </assemblyBinding></runtime>
<appSettings> <appSettings>

View File

@@ -35,7 +35,7 @@
</SccAuxPath> </SccAuxPath>
<SccProvider> <SccProvider>
</SccProvider> </SccProvider>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<OldToolsVersion>2.0</OldToolsVersion> <OldToolsVersion>2.0</OldToolsVersion>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>

View File

@@ -18,7 +18,7 @@
</SccAuxPath> </SccAuxPath>
<SccProvider> <SccProvider>
</SccProvider> </SccProvider>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<FileUpgradeFlags> <FileUpgradeFlags>
</FileUpgradeFlags> </FileUpgradeFlags>
<UpgradeBackupLocation> <UpgradeBackupLocation>

View File

@@ -35,7 +35,7 @@
</SccAuxPath> </SccAuxPath>
<SccProvider> <SccProvider>
</SccProvider> </SccProvider>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<OldToolsVersion>2.0</OldToolsVersion> <OldToolsVersion>2.0</OldToolsVersion>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>

View File

@@ -35,7 +35,7 @@
</SccAuxPath> </SccAuxPath>
<SccProvider> <SccProvider>
</SccProvider> </SccProvider>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<OldToolsVersion>2.0</OldToolsVersion> <OldToolsVersion>2.0</OldToolsVersion>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>

View File

@@ -35,7 +35,7 @@
</SccAuxPath> </SccAuxPath>
<SccProvider> <SccProvider>
</SccProvider> </SccProvider>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<OldToolsVersion>2.0</OldToolsVersion> <OldToolsVersion>2.0</OldToolsVersion>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>

View File

@@ -51,7 +51,7 @@
</SccAuxPath> </SccAuxPath>
<SccProvider> <SccProvider>
</SccProvider> </SccProvider>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

View File

@@ -46,7 +46,7 @@
</SccAuxPath> </SccAuxPath>
<SccProvider> <SccProvider>
</SccProvider> </SccProvider>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<OldToolsVersion>2.0</OldToolsVersion> <OldToolsVersion>2.0</OldToolsVersion>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>

View File

@@ -35,7 +35,7 @@
</SccAuxPath> </SccAuxPath>
<SccProvider> <SccProvider>
</SccProvider> </SccProvider>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<OldToolsVersion>2.0</OldToolsVersion> <OldToolsVersion>2.0</OldToolsVersion>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>

View File

@@ -35,7 +35,7 @@
</SccAuxPath> </SccAuxPath>
<SccProvider> <SccProvider>
</SccProvider> </SccProvider>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<OldToolsVersion>2.0</OldToolsVersion> <OldToolsVersion>2.0</OldToolsVersion>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>

View File

@@ -60,6 +60,6 @@
</logger> </logger>
</log4net> </log4net>
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/>
</startup> </startup>
</configuration> </configuration>

View File

@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>RoAccessToSql</RootNamespace> <RootNamespace>RoAccessToSql</RootNamespace>
<AssemblyName>RoAccessToSql</AssemblyName> <AssemblyName>RoAccessToSql</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
<SccProjectName> <SccProjectName>

View File

@@ -33,7 +33,7 @@
</SccAuxPath> </SccAuxPath>
<SccProvider> <SccProvider>
</SccProvider> </SccProvider>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<OldToolsVersion>2.0</OldToolsVersion> <OldToolsVersion>2.0</OldToolsVersion>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>

View File

@@ -1,73 +1,73 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<configSections> <configSections>
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" /> <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="VEPROMS.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" /> <section name="VEPROMS.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
<section name="UISampleNetBar1.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" /> <section name="UISampleNetBar1.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
</sectionGroup> </sectionGroup>
</configSections> </configSections>
<log4net> <log4net>
<appender name="LogFileAppender" type="log4net.Appender.FileAppender"> <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
<param name="File" value="${USERPROFILE}/My Documents/VEPROMS/ErrorLog.txt" /> <param name="File" value="${USERPROFILE}/My Documents/VEPROMS/ErrorLog.txt"/>
<!--<param name="File" value="${APPDATA}/Volian/Proms2010/ErrorLog.txt" />--> <!--<param name="File" value="${APPDATA}/Volian/Proms2010/ErrorLog.txt" />-->
<!--<param name="File" value="${LOCALAPPDATA}/Temp/VEPROMS/ErrorLog.txt" />--> <!--<param name="File" value="${LOCALAPPDATA}/Temp/VEPROMS/ErrorLog.txt" />-->
<param name="AppendToFile" value="true" /> <param name="AppendToFile" value="true"/>
<layout type="log4net.Layout.PatternLayout"> <layout type="log4net.Layout.PatternLayout">
<!--<param name="Header" value="[Header]\r\n" />--> <!--<param name="Header" value="[Header]\r\n" />-->
<!--<param name="Footer" value="[Footer]\r\n" />--> <!--<param name="Footer" value="[Footer]\r\n" />-->
<param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n" /> <param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n"/>
</layout> </layout>
</appender> </appender>
<appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender"> <appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender">
<layout type="log4net.Layout.PatternLayout"> <layout type="log4net.Layout.PatternLayout">
<conversionPattern value="--&gt; %date [%thread] %-5level %logger (%property{log4net:HostName}) [%ndc] - %message%newline" /> <conversionPattern value="--&gt; %date [%thread] %-5level %logger (%property{log4net:HostName}) [%ndc] - %message%newline"/>
</layout> </layout>
</appender> </appender>
<appender name="EventLogAppender" type="log4net.Appender.EventLogAppender"> <appender name="EventLogAppender" type="log4net.Appender.EventLogAppender">
<threshold value="WARN" /> <threshold value="WARN"/>
<mapping> <mapping>
<level value="DEBUG" /> <level value="DEBUG"/>
<eventLogEntryType value="Information" /> <eventLogEntryType value="Information"/>
</mapping> </mapping>
<mapping> <mapping>
<level value="INFO" /> <level value="INFO"/>
<eventLogEntryType value="Information" /> <eventLogEntryType value="Information"/>
</mapping> </mapping>
<mapping> <mapping>
<level value="WARN" /> <level value="WARN"/>
<eventLogEntryType value="Warning" /> <eventLogEntryType value="Warning"/>
</mapping> </mapping>
<mapping> <mapping>
<level value="ERROR" /> <level value="ERROR"/>
<eventLogEntryType value="Error" /> <eventLogEntryType value="Error"/>
</mapping> </mapping>
<mapping> <mapping>
<level value="FATAL" /> <level value="FATAL"/>
<eventLogEntryType value="Error" /> <eventLogEntryType value="Error"/>
</mapping> </mapping>
<layout type="log4net.Layout.PatternLayout"> <layout type="log4net.Layout.PatternLayout">
<param name="ConversionPattern" value="---&gt; %d [%t] %-5p %c - %m%n" /> <param name="ConversionPattern" value="---&gt; %d [%t] %-5p %c - %m%n"/>
</layout> </layout>
</appender> </appender>
<root> <root>
<level value="ALL" /> <level value="ALL"/>
<appender-ref ref="ConsoleAppender" /> <appender-ref ref="ConsoleAppender"/>
<appender-ref ref="LogFileAppender" /> <appender-ref ref="LogFileAppender"/>
<appender-ref ref="EventLogAppender" /> <appender-ref ref="EventLogAppender"/>
</root> </root>
<logger name="VEPROMS.CSLA.Library"> <logger name="VEPROMS.CSLA.Library">
<level value="INFO" /> <level value="INFO"/>
</logger> </logger>
<logger name="Volian.Controls.Library"> <logger name="Volian.Controls.Library">
<level value="INFO" /> <level value="INFO"/>
</logger> </logger>
</log4net> </log4net>
<appSettings> <appSettings>
<add key="OperatingMode" value="Production" /> <add key="OperatingMode" value="Production"/>
<!--"Debug" "Production" "Demo"/--> <!--"Debug" "Production" "Demo"/-->
<add key="OriginalPageBreak" value="False" /> <add key="OriginalPageBreak" value="False"/>
<add key="CslaAuthentication" value="Windows" /> <add key="CslaAuthentication" value="Windows"/>
<!-- <!--
<add key="CslaDataPortalProxy" <add key="CslaDataPortalProxy"
value="Csla.DataPortalClient.RemotingProxy, Csla"/> value="Csla.DataPortalClient.RemotingProxy, Csla"/>
@@ -85,17 +85,17 @@
value="EnterpriseServicesHost.EnterpriseServicesProxy, value="EnterpriseServicesHost.EnterpriseServicesProxy,
EnterpriseServicesHost"/> EnterpriseServicesHost"/>
--> -->
<add key="ClientSettingsProvider.ServiceUri" value="" /> <add key="ClientSettingsProvider.ServiceUri" value=""/>
</appSettings> </appSettings>
<connectionStrings> <connectionStrings>
<add name="VEPROMS" connectionString="Data Source=VOLIAN-SERVER;User Id=proms2010;password=proms2010;Initial Catalog=VEPROMS" providerName="System.Data.SqlClient" /> <add name="VEPROMS" connectionString="Data Source=VOLIAN-SERVER;User Id=proms2010;password=proms2010;Initial Catalog=VEPROMS" providerName="System.Data.SqlClient"/>
<add name="VEPROMS_LOCAL" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" /> <add name="VEPROMS_LOCAL" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient"/>
<add name="VEPROMS_RMARK_DEBUG" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" /> <add name="VEPROMS_RMARK_DEBUG" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient"/>
<add name="VEPROMS_RMARK_DEMO" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" /> <add name="VEPROMS_RMARK_DEMO" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient"/>
<!--<add name="VEPROMS_BODINE_DEBUG" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" /> <!--<add name="VEPROMS_BODINE_DEBUG" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />
<add name="VEPROMS_BODINE_DEMO" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />--> <add name="VEPROMS_BODINE_DEMO" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />-->
<add name="VEPROMS_BODINE_DEBUG" connectionString="Data Source=JCB2-HP\VOLIAN08;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" /> <add name="VEPROMS_BODINE_DEBUG" connectionString="Data Source=JCB2-HP\VOLIAN08;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient"/>
<add name="VEPROMS_BODINE_DEMO" connectionString="Data Source=JCB2-HP\VOLIAN08;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" /> <add name="VEPROMS_BODINE_DEMO" connectionString="Data Source=JCB2-HP\VOLIAN08;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient"/>
<!--<add name="VEPROMS_BODINE_DEBUG" connectionString="Data Source=JCB2-HP\VOLIAN12;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" /> <!--<add name="VEPROMS_BODINE_DEBUG" connectionString="Data Source=JCB2-HP\VOLIAN12;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />
<add name="VEPROMS_BODINE_DEMO" connectionString="Data Source=JCB2-HP\VOLIAN12;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />--> <add name="VEPROMS_BODINE_DEMO" connectionString="Data Source=JCB2-HP\VOLIAN12;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />-->
</connectionStrings> </connectionStrings>
@@ -135,10 +135,10 @@
<value>True</value> <value>True</value>
</setting> </setting>
<setting name="QATItems" serializeAs="String"> <setting name="QATItems" serializeAs="String">
<value /> <value/>
</setting> </setting>
<setting name="DefaultDB" serializeAs="String"> <setting name="DefaultDB" serializeAs="String">
<value /> <value/>
</setting> </setting>
<setting name="LastVersion" serializeAs="String"> <setting name="LastVersion" serializeAs="String">
<value>0.0</value> <value>0.0</value>
@@ -150,10 +150,10 @@
<value>True</value> <value>True</value>
</setting> </setting>
<setting name="SMTPServer" serializeAs="String"> <setting name="SMTPServer" serializeAs="String">
<value /> <value/>
</setting> </setting>
<setting name="SMTPUser" serializeAs="String"> <setting name="SMTPUser" serializeAs="String">
<value /> <value/>
</setting> </setting>
<setting name="UpdateSettings" serializeAs="String"> <setting name="UpdateSettings" serializeAs="String">
<value>True</value> <value>True</value>
@@ -181,18 +181,22 @@
</UISampleNetBar1.Properties.Settings> </UISampleNetBar1.Properties.Settings>
</userSettings> </userSettings>
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" /> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/>
</startup> </startup>
<runtime>
<AppContextSwitchOverrides
value="Switch.System.Windows.Forms.DoNotLoadLatestRichEditControl=true" />
</runtime>
<system.web> <system.web>
<membership defaultProvider="ClientAuthenticationMembershipProvider"> <membership defaultProvider="ClientAuthenticationMembershipProvider">
<providers> <providers>
<add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" /> <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri=""/>
</providers> </providers>
</membership> </membership>
<roleManager defaultProvider="ClientRoleProvider" enabled="true"> <roleManager defaultProvider="ClientRoleProvider" enabled="true">
<providers> <providers>
<add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" /> <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400"/>
</providers> </providers>
</roleManager> </roleManager>
</system.web> </system.web>
</configuration> </configuration>

View File

@@ -18,14 +18,14 @@ namespace VEPROMS
{ {
public bool SaveLinks public bool SaveLinks
{ {
get get
{ {
return swtbtnPDFLinks.Value; return swtbtnPDFLinks.Value;
} }
} }
public int RemoveTrailingHardReturnsAndManualPageBreaks public int RemoveTrailingHardReturnsAndManualPageBreaks
{ {
get get
{ {
// C2021-010: Remove trailing returns/spaces & manual page breaks & allow save. // C2021-010: Remove trailing returns/spaces & manual page breaks & allow save.
// return values: 0=None; 1=Trailing; 2=ManualPgBrk; 3=Both. // return values: 0=None; 1=Trailing; 2=ManualPgBrk; 3=Both.
@@ -33,7 +33,7 @@ namespace VEPROMS
if (!cbxRemoveManualPgBrk.Checked && !cbxRemoveTrailing.Checked) return 0; if (!cbxRemoveManualPgBrk.Checked && !cbxRemoveTrailing.Checked) return 0;
if (!cbxRemoveManualPgBrk.Checked && cbxRemoveTrailing.Checked) return 1; if (!cbxRemoveManualPgBrk.Checked && cbxRemoveTrailing.Checked) return 1;
if (cbxRemoveManualPgBrk.Checked && !cbxRemoveTrailing.Checked) return 2; if (cbxRemoveManualPgBrk.Checked && !cbxRemoveTrailing.Checked) return 2;
return 3; return 3;
} }
} }
private string _Prefix = ""; // RHM20150506 Multiline ItemID TextBox private string _Prefix = ""; // RHM20150506 Multiline ItemID TextBox
@@ -59,10 +59,8 @@ namespace VEPROMS
get { return _Automatic; } get { return _Automatic; }
set { _Automatic = value; } set { _Automatic = value; }
} }
// C2024-003 parameter contains parent section, child section, issubsection flag. private int _prtSectID = -1;
// C2024-003 values needed to print section. public int PrtSectID
private int[] _prtSectID = new int[] { -1, -1, 0 };
public int[] PrtSectID
{ {
get { return _prtSectID; } get { return _prtSectID; }
set { _prtSectID = value; } set { _prtSectID = value; }
@@ -75,8 +73,8 @@ namespace VEPROMS
public bool AllowDateTimePrefixSuffix public bool AllowDateTimePrefixSuffix
{ {
get { return _AllowDateTimePrefixSuffix; } get { return _AllowDateTimePrefixSuffix; }
set set
{ {
_AllowDateTimePrefixSuffix = value; _AllowDateTimePrefixSuffix = value;
swtbtnPDFdtPrefixSuffix.Value = swtbtnPDFdtPrefixSuffix.Enabled = _AllowDateTimePrefixSuffix; swtbtnPDFdtPrefixSuffix.Value = swtbtnPDFdtPrefixSuffix.Enabled = _AllowDateTimePrefixSuffix;
} }
@@ -88,7 +86,7 @@ namespace VEPROMS
{ {
cbxDebugPagination.Checked = true; cbxDebugPagination.Checked = true;
cbxDebugText.Checked = true; cbxDebugText.Checked = true;
cbxMetaFile.Checked = true; // C2018-004 create meta file for baseline compares cbxMetaFile.Checked = true; // C2018-004 create meta file for baseline compares
_IncludeWordSecTextInMetafile = true; _IncludeWordSecTextInMetafile = true;
Application.DoEvents(); Application.DoEvents();
string[] parameters = System.Environment.CommandLine.Split(" ".ToCharArray()); string[] parameters = System.Environment.CommandLine.Split(" ".ToCharArray());
@@ -103,7 +101,7 @@ namespace VEPROMS
cbxDebug.Checked = false; cbxDebug.Checked = false;
else if (parameter.ToUpper() == "/NM") else if (parameter.ToUpper() == "/NM")
cbxMetaFile.Checked = false; // C2018-004 turn off create meta file for baseline compares cbxMetaFile.Checked = false; // C2018-004 turn off create meta file for baseline compares
else if (parameter.ToUpper() == "/NW") else if (parameter.ToUpper() == "/NW")
_IncludeWordSecTextInMetafile = false; // C2018-023 turn off putting Word attachment text in the meta file for baseline compares _IncludeWordSecTextInMetafile = false; // C2018-023 turn off putting Word attachment text in the meta file for baseline compares
} }
CreatePDFs(); CreatePDFs();
@@ -145,11 +143,10 @@ namespace VEPROMS
} }
public string PDFPath public string PDFPath
{ {
get get {// B2018-069 Revert to Temporary for Baseline testing
{// B2018-069 Revert to Temporary for Baseline testing
if (PromsPrinter.BaselineTesting) if (PromsPrinter.BaselineTesting)
return VlnSettings.TemporaryFolder; return VlnSettings.TemporaryFolder;
return txbPDFLocation.Text; return txbPDFLocation.Text;
} }
set { txbPDFLocation.Text = value; } set { txbPDFLocation.Text = value; }
} }
@@ -193,7 +190,7 @@ namespace VEPROMS
if (_MyProcedure != null && _MyProcedure.ProcHasSupInfoData) if (_MyProcedure != null && _MyProcedure.ProcHasSupInfoData)
{ {
swtbtnBlankPgsForDuplex.Enabled = false; swtbtnBlankPgsForDuplex.Enabled = false;
tbBlankPage.Enabled = true; // C2019-004: Allow user to define duplex blank page text (similar changes throughout file are not commented) tbBlankPage.Enabled = true; // C2019-004: Allow user to define duplex blank page text (similar changes throughout file are not commented)
} }
btnCreatePDF.Text = "Create PDFs"; btnCreatePDF.Text = "Create PDFs";
HandleDocVersionSettings(); HandleDocVersionSettings();
@@ -238,7 +235,7 @@ namespace VEPROMS
gpnlDebug.Visible = Volian.Base.Library.VlnSettings.DebugMode; gpnlDebug.Visible = Volian.Base.Library.VlnSettings.DebugMode;
swtbtnGeneratePlacekeeper.Value = false; swtbtnGeneratePlacekeeper.Value = false;
cbxGenerateConActSum.Checked = false; cbxGenerateConActSum.Checked = false;
swtbtnGeneratePlacekeeper.Visible = lblGeneratePlacekeeper.Visible = oneProcedure && swtbtnGeneratePlacekeeper.Visible = lblGeneratePlacekeeper.Visible = oneProcedure &&
((MyProcedure.ActiveFormat.PlantFormat.FormatData.PurchaseOptions & E_PurchaseOptions.AutoPlacekeeper) == E_PurchaseOptions.AutoPlacekeeper); ((MyProcedure.ActiveFormat.PlantFormat.FormatData.PurchaseOptions & E_PurchaseOptions.AutoPlacekeeper) == E_PurchaseOptions.AutoPlacekeeper);
// C2021-062 make visable the check box to assign rev number for all procedures being printed // C2021-062 make visable the check box to assign rev number for all procedures being printed
// also make visable the Rev Num entry field. // also make visable the Rev Num entry field.
@@ -283,7 +280,7 @@ namespace VEPROMS
expPrnSetting.Expanded = swtbtnBlankPgsForDuplex.Value || swtbtnChgBar.Value || swtbtnGeneratePlacekeeper.Value || swtbtnPDFLinks.Value || swtbtnPROMSVersion.Value || swtbtnWaterMark.Value || swtbtnPDFdtPrefixSuffix.Value; expPrnSetting.Expanded = swtbtnBlankPgsForDuplex.Value || swtbtnChgBar.Value || swtbtnGeneratePlacekeeper.Value || swtbtnPDFLinks.Value || swtbtnPROMSVersion.Value || swtbtnWaterMark.Value || swtbtnPDFdtPrefixSuffix.Value;
} }
public DlgPrintProcedure(ProcedureInfo pi, bool automatic) // RHM20150506 Multiline ItemID TextBox public DlgPrintProcedure(ProcedureInfo pi, bool automatic) // RHM20150506 Multiline ItemID TextBox
{ {
InitializeComponent(); InitializeComponent();
Automatic = automatic; Automatic = automatic;
_AllProcedures = false; _AllProcedures = false;
@@ -312,7 +309,7 @@ namespace VEPROMS
{ {
base.OnActivated(e); base.OnActivated(e);
if (Owner != null) if (Owner != null)
Location = new Point(Owner.Left + Owner.Width / 2 - Width / 2, Owner.Top + Owner.Height / 2 - Height / 2); Location = new Point(Owner.Left + Owner.Width / 2 - Width / 2, Owner.Top + Owner.Height/2 - Height/2);
} }
private void HandleDocVersionSettings() private void HandleDocVersionSettings()
{ {
@@ -326,10 +323,10 @@ namespace VEPROMS
// if the default setting is 'SelectBeforePrinting', expand the Additional Print Settings panel // if the default setting is 'SelectBeforePrinting', expand the Additional Print Settings panel
if (_DocVersionConfig.Print_ChangeBar == PrintChangeBar.SelectBeforePrinting) if (_DocVersionConfig.Print_ChangeBar == PrintChangeBar.SelectBeforePrinting)
{ {
swtbtnChgBar.Value = false; swtbtnChgBar.Value = false;
cbxOvrrideDefChgBars.Checked = false; cbxOvrrideDefChgBars.Checked = false;
expPrnSetting.Expanded = true; expPrnSetting.Expanded = true;
} }
} }
private void GetDocVersionSettings() private void GetDocVersionSettings()
@@ -344,14 +341,14 @@ namespace VEPROMS
cbxOpenAfterCreate2.Checked = _DocVersionConfig.Print_AlwaysViewPDFAfterCreate; cbxOpenAfterCreate2.Checked = _DocVersionConfig.Print_AlwaysViewPDFAfterCreate;
// Changebars on/off // Changebars on/off
if (_DocVersionConfig.Print_ChangeBar == PrintChangeBar.Without) if (_DocVersionConfig.Print_ChangeBar == PrintChangeBar.Without)
swtbtnChgBar.Value = false; swtbtnChgBar.Value = false;
else else
swtbtnChgBar.Value = true; swtbtnChgBar.Value = true;
// Watermark on/off // Watermark on/off
if (_DocVersionConfig.Print_Watermark == PrintWatermark.None) if (_DocVersionConfig.Print_Watermark == PrintWatermark.None)
swtbtnWaterMark.Value = false; swtbtnWaterMark.Value = false;
else else
swtbtnWaterMark.Value = true; swtbtnWaterMark.Value = true;
// Auto Duplexing on/off - Auto duplex was used only by Point Beach formats These buttons were removed from the dialog // Auto Duplexing on/off - Auto duplex was used only by Point Beach formats These buttons were removed from the dialog
// There was not print coding to support this format flag // There was not print coding to support this format flag
@@ -376,7 +373,7 @@ namespace VEPROMS
// default to using OriginalPageBreaks (16bit page breaks) if App.config is set // default to using OriginalPageBreaks (16bit page breaks) if App.config is set
// to true: // to true:
//cbxOrPgBrk.Visible = VlnSettings.OriginalPageBreak && VlnSettings.DebugMode; //cbxOrPgBrk.Visible = VlnSettings.OriginalPageBreak && VlnSettings.DebugMode;
cbxOrPgBrk.Visible = false; //per Harry cbxOrPgBrk.Visible = false; //per Harry
cbxOrPgBrk.Checked = false; cbxOrPgBrk.Checked = false;
} }
@@ -413,7 +410,7 @@ namespace VEPROMS
private Timer _MyTimer; private Timer _MyTimer;
public void SetupForProcedure() // RHM20150506 Multiline ItemID TextBox public void SetupForProcedure() // RHM20150506 Multiline ItemID TextBox
{ {
if (_DocVersionInfo == null) this.Text = "Create PDF for " + ProcNum; if(_DocVersionInfo == null)this.Text = "Create PDF for " + ProcNum;
// get list of previous pdf files // get list of previous pdf files
// if no previous pdf file, then get path from frmVersionProperties // if no previous pdf file, then get path from frmVersionProperties
// dlgSelectFile.InitialDirectory = pdf path from frmVersionProperties // dlgSelectFile.InitialDirectory = pdf path from frmVersionProperties
@@ -422,20 +419,20 @@ namespace VEPROMS
//txbPDFLocation.Text = _PDFPath; //txbPDFLocation.Text = _PDFPath;
BuildPDFFileName(); BuildPDFFileName();
ProcedureConfig pc = _MyProcedure.MyConfig as ProcedureConfig; ProcedureConfig pc = _MyProcedure.MyConfig as ProcedureConfig;
if (SelectedSlave > 0) pc.SelectedSlave = SelectedSlave; if(SelectedSlave > 0) pc.SelectedSlave = SelectedSlave;
if (pc != null) if (pc != null)
{ {
//C2021-062 use the save rev number for all procedures if set, or just use the rev number in the current procedure config //C2021-062 use the save rev number for all procedures if set, or just use the rev number in the current procedure config
RevNum = (_NewRevForAllProcs == null) ? pc.Print_Rev : _NewRevForAllProcs; RevNum = (_NewRevForAllProcs == null) ? pc.Print_Rev : _NewRevForAllProcs;
RevDate = pc.Print_RevDate; //== null || pc.Print_RevDate=="" ? DateTime.Today : Convert.ToDateTime(pc.Print_RevDate); RevDate = pc.Print_RevDate; //== null || pc.Print_RevDate=="" ? DateTime.Today : Convert.ToDateTime(pc.Print_RevDate);
ReviewDate = pc.Print_ReviewDate; // == null ? DateTime.Today : Convert.ToDateTime(pc.Print_ReviewDate); ReviewDate = pc.Print_ReviewDate; // == null ? DateTime.Today : Convert.ToDateTime(pc.Print_ReviewDate);
//Now check the format flags to determine if/how the Rev string should be parsed. //Now check the format flags to determine if/how the Rev string should be parsed.
// This will covert the old way (16-bit) of setting a RevDate (appending it to the RevNumber) // This will covert the old way (16-bit) of setting a RevDate (appending it to the RevNumber)
// to the new way saving the RevNumber and RevDate in there own config fields // to the new way saving the RevNumber and RevDate in there own config fields
if ((_MyProcedure.ActiveFormat.PlantFormat.FormatData.PrintData.DoRevDate && RevNum.Contains("/")) if ((_MyProcedure.ActiveFormat.PlantFormat.FormatData.PrintData.DoRevDate && RevNum.Contains("/"))
|| (_MyProcedure.ActiveFormat.PlantFormat.FormatData.PrintData.RevDateWithForwardSlash && RevNum.Contains("\\"))) || (_MyProcedure.ActiveFormat.PlantFormat.FormatData.PrintData.RevDateWithForwardSlash && RevNum.Contains("\\")))
{ {
int indx = RevNum.IndexOf(_MyProcedure.ActiveFormat.PlantFormat.FormatData.PrintData.RevDateWithForwardSlash ? '\\' : '/'); int indx = RevNum.IndexOf(_MyProcedure.ActiveFormat.PlantFormat.FormatData.PrintData.RevDateWithForwardSlash ? '\\' : '/');
pc.Print_RevDate = RevDate = RevNum.Substring(indx + 1); pc.Print_RevDate = RevDate = RevNum.Substring(indx + 1);
pc.Print_Rev = RevNum = RevNum.Substring(0, indx); pc.Print_Rev = RevNum = RevNum.Substring(0, indx);
// save the RevNumber and RevDate to the procedure's config. // save the RevNumber and RevDate to the procedure's config.
@@ -533,8 +530,8 @@ namespace VEPROMS
if (dtPre != PDFDTPrefix.None) PDFFilePrefix = ""; // incase user entered prefix text but then selected a date/time (in working draft properties) if (dtPre != PDFDTPrefix.None) PDFFilePrefix = ""; // incase user entered prefix text but then selected a date/time (in working draft properties)
if (dtSuf != PDFDTSuffix.None) PDFFileSuffix = ""; // incase user entered suffix text but then selected a date/time (in working draft properties) if (dtSuf != PDFDTSuffix.None) PDFFileSuffix = ""; // incase user entered suffix text but then selected a date/time (in working draft properties)
// B2020-062 control the toggle of date/time prefix/suffix on pdf file name // B2020-062 control the toggle of date/time prefix/suffix on pdf file name
// disable the date/time Prefix/Suffix switch if no date/time was selected // disable the date/time Prefix/Suffix switch if no date/time was selected
// This switch is does not affect the use of it if the user typed in text for prefix/suffix // This switch is does not affect the use of it if the user typed in text for prefix/suffix
if (!AllowDateTimePrefixSuffix || (dtPre == PDFDTPrefix.None && dtSuf == PDFDTSuffix.None)) if (!AllowDateTimePrefixSuffix || (dtPre == PDFDTPrefix.None && dtSuf == PDFDTSuffix.None))
{ {
swtbtnPDFdtPrefixSuffix.Value = false; swtbtnPDFdtPrefixSuffix.Value = false;
@@ -610,7 +607,7 @@ namespace VEPROMS
private void swtbtnWaterMark_ValueChanged(object sender, EventArgs e) private void swtbtnWaterMark_ValueChanged(object sender, EventArgs e)
{ {
if (!swtbtnWaterMark.Value) // C2021-019: make both invisible if (!swtbtnWaterMark.Value) // C2021-019: make both invisible
{ {
cbxWaterMark.Visible = swtbtnWaterMark.Value; cbxWaterMark.Visible = swtbtnWaterMark.Value;
lblWaterMarkOvrd.Visible = swtbtnWaterMark.Value; lblWaterMarkOvrd.Visible = swtbtnWaterMark.Value;
@@ -637,7 +634,7 @@ namespace VEPROMS
if (!Directory.Exists(PDFPath)) if (!Directory.Exists(PDFPath))
{ {
string msg = string.Format("'{0}' does not exist. \n\nCreate it?", PDFPath); string msg = string.Format("'{0}' does not exist. \n\nCreate it?", PDFPath);
DialogResult dr = MessageBox.Show(msg, "Folder Not Found", MessageBoxButtons.YesNo, MessageBoxIcon.Question); DialogResult dr= MessageBox.Show(msg, "Folder Not Found", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
if (dr == DialogResult.Yes) if (dr == DialogResult.Yes)
{ {
try try
@@ -671,7 +668,7 @@ namespace VEPROMS
public ProcedureInfo MyProcedure public ProcedureInfo MyProcedure
{ {
get { return _MyProcedure; } get { return _MyProcedure; }
set set
{ {
_MyProcedure = value; _MyProcedure = value;
// if procedure has supplemental information, the automatially check the add blank pages for duplex printing // if procedure has supplemental information, the automatially check the add blank pages for duplex printing
@@ -733,11 +730,11 @@ namespace VEPROMS
int i = 0; int i = 0;
pbPDFsStatus.Maximum = n; pbPDFsStatus.Maximum = n;
pbPDFsStatus.Visible = true; pbPDFsStatus.Visible = true;
VlnSvgPageHelper.CountInApplProcs = 1; // B2021-127: BNPPalr - Auto set of serial #, skip Front Matter as per PAL 11/1/21 (set to 1 not 0) VlnSvgPageHelper.CountInApplProcs = 1; // B2021-127: BNPPalr - Auto set of serial #, skip Front Matter as per PAL 11/1/21 (set to 1 not 0)
this.Text = string.Format("Processing {0}", _DocVersionInfo.MyFolder.Name); this.Text = string.Format("Processing {0}", _DocVersionInfo.MyFolder.Name);
foreach (ProcedureInfo myProc in _DocVersionInfo.Procedures) foreach (ProcedureInfo myProc in _DocVersionInfo.Procedures)
{ {
string locpdfname = null; // get pdf file name for later merge code string locpdfname = null; // get pdf file name for later merge code
MyProcedure = myProc; MyProcedure = myProc;
// C2021-019: Override Watermark Text, 'waterMarkText' will have whatever watermark text should be printed // C2021-019: Override Watermark Text, 'waterMarkText' will have whatever watermark text should be printed
ProcedureConfig procConfig = MyProcedure.MyConfig as ProcedureConfig; ProcedureConfig procConfig = MyProcedure.MyConfig as ProcedureConfig;
@@ -774,7 +771,7 @@ namespace VEPROMS
string myPDFPath = GetMultiunitPDFPath(); string myPDFPath = GetMultiunitPDFPath();
_MergedPdfPath = myPDFPath; // If Slave, need its subdirectory/unit path for merging _MergedPdfPath = myPDFPath; // If Slave, need its subdirectory/unit path for merging
// RHM 20120925 Overlay the bottom of the dialog so that cancel button is covered. // RHM 20120925 Overlay the bottom of the dialog so that cancel button is covered.
// B2021-102 put in the using for better memory management // B2021-102 put in the using for better memory management
using (frmPDFStatusForm frmStatus = new frmPDFStatusForm(MyProcedure, RevNumAndDate, waterMarkText, cbxDebug.Checked, cbxOrPgBrk.Checked, using (frmPDFStatusForm frmStatus = new frmPDFStatusForm(MyProcedure, RevNumAndDate, waterMarkText, cbxDebug.Checked, cbxOrPgBrk.Checked,
cbxOpenAfterCreate2.Checked, cbxOverwritePDF2.Checked, myPDFPath, cbd, txbPDFName.Text, new Point(Left, Bottom - 50), cbxOpenAfterCreate2.Checked, cbxOverwritePDF2.Checked, myPDFPath, cbd, txbPDFName.Text, new Point(Left, Bottom - 50),
@@ -874,7 +871,7 @@ namespace VEPROMS
} }
} }
pbPDFsStatus.Visible = false; pbPDFsStatus.Visible = false;
if (!Automatic) if(!Automatic)
ShowDebugFiles(); ShowDebugFiles();
ProfileTimer.Pop(profileDepth); ProfileTimer.Pop(profileDepth);
ProfileTimer.ShowTimerTable(); ProfileTimer.ShowTimerTable();
@@ -946,7 +943,7 @@ namespace VEPROMS
if (cbxDebugText.Checked) if (cbxDebugText.Checked)
Volian.Base.Library.DebugText.Show(); Volian.Base.Library.DebugText.Show();
if (cbxMetaFile.Checked)// C2018-004 create meta file for baseline compares if (cbxMetaFile.Checked)// C2018-004 create meta file for baseline compares
Volian.Base.Library.BaselineMetaFile.Show(); // baseline Volian.Base.Library.BaselineMetaFile.Show(); // baseline
} }
public void CreatePDF() // RHM20150506 Multiline ItemID TextBox public void CreatePDF() // RHM20150506 Multiline ItemID TextBox
{ {
@@ -962,8 +959,8 @@ namespace VEPROMS
} }
MyProcedure.SelectedChildToPrint = SelectedSlave; // B2023-035 for BNPP Alarms save the number of the child selected to print MyProcedure.SelectedChildToPrint = SelectedSlave; // B2023-035 for BNPP Alarms save the number of the child selected to print
// B2021-127: BNPPalr - Auto set of serial #, skip Front Matter as per PAL 11/1/21 (set to 1 not 0) // B2021-127: BNPPalr - Auto set of serial #, skip Front Matter as per PAL 11/1/21 (set to 1 not 0)
// Only do if set has applicability, printing an individual procedure, need to determine // Only do if set has applicability, printing an individual procedure, need to determine
// applicability count. // applicability count.
if (MyProcedure.MyDocVersion.MultiUnitCount > 1) if (MyProcedure.MyDocVersion.MultiUnitCount > 1)
{ {
VlnSvgPageHelper.CountInApplProcs = 1; VlnSvgPageHelper.CountInApplProcs = 1;
@@ -980,12 +977,12 @@ namespace VEPROMS
Volian.Print.Library.Rtf2Pdf.PdfDebug = cbxDebug.Checked; Volian.Print.Library.Rtf2Pdf.PdfDebug = cbxDebug.Checked;
// B2019-044 don't print the watermark if the watermark switch on the print dialog is turned off // B2019-044 don't print the watermark if the watermark switch on the print dialog is turned off
cbxWaterMark.Visible = true; cbxWaterMark.Visible = true;
string waterMarkText = (swtbtnWaterMark.Value) ? cbxWaterMark.Text : "None"; // B2018-124 use text of watermark form drop down list instead of enum value string waterMarkText = (swtbtnWaterMark.Value) ? cbxWaterMark.Text : "None" ; // B2018-124 use text of watermark form drop down list instead of enum value
string watermarkColor = "Blue"; // this is the default watermark color string watermarkColor = "Blue"; // this is the default watermark color
frmPDFStatusForm.SetUnitWatermark(MyProcedure, ref waterMarkText, ref watermarkColor); //C2022-004 Unit Designator Watermark frmPDFStatusForm.SetUnitWatermark(MyProcedure, ref waterMarkText, ref watermarkColor); //C2022-004 Unit Designator Watermark
ProcedureConfig procConfig = MyProcedure.MyConfig as ProcedureConfig; ProcedureConfig procConfig = MyProcedure.MyConfig as ProcedureConfig;
string waterMarkTextOverride = ""; string waterMarkTextOverride = "";
if (procConfig != null) waterMarkTextOverride = procConfig.GetValue("PSI", "WATERMARKOVERRIDE"); // C2021-019: override watermark text if (procConfig != null) waterMarkTextOverride = procConfig.GetValue("PSI", "WATERMARKOVERRIDE"); // C2021-019: override watermark text
if (swtbtnWaterMark.Value && waterMarkTextOverride != null && waterMarkTextOverride != "") waterMarkText = waterMarkTextOverride; if (swtbtnWaterMark.Value && waterMarkTextOverride != null && waterMarkTextOverride != "") waterMarkText = waterMarkTextOverride;
// Determine change bar settings. First get from config & then see if override from dialog. // Determine change bar settings. First get from config & then see if override from dialog.
// Also check that format allows override. // Also check that format allows override.
@@ -1202,7 +1199,7 @@ namespace VEPROMS
grpDateSelector.Text = "Select Revision Date"; grpDateSelector.Text = "Select Revision Date";
grpDateSelector.Visible = calDateSelector.Visible = true; grpDateSelector.Visible = calDateSelector.Visible = true;
//C2021-007 position the calendar to the current RevDate or if no RevDate, position to today's date //C2021-007 position the calendar to the current RevDate or if no RevDate, position to today's date
DateTime initSelDate = (txbDate.Text != null && txbDate.Text.Length != 0) ? Convert.ToDateTime(txbDate.Text) : DateTime.Today; DateTime initSelDate =(txbDate.Text != null && txbDate.Text.Length != 0)? Convert.ToDateTime(txbDate.Text) : DateTime.Today;
calDateSelector.DisplayMonth = calDateSelector.SelectedDate = initSelDate; calDateSelector.DisplayMonth = calDateSelector.SelectedDate = initSelDate;
} }
@@ -1301,11 +1298,11 @@ namespace VEPROMS
} }
private void expPrnSetting_ExpandedChanging(object sender, DevComponents.DotNetBar.ExpandedChangeEventArgs e) private void expPrnSetting_ExpandedChanging(object sender, DevComponents.DotNetBar.ExpandedChangeEventArgs e)
{ {
if (expPrnSetting.Expanded) if (expPrnSetting.Expanded)
//this.Size = new Size(this.Size.Width+(expPrnSetting.Size.Width-expPrnSetting.TitlePanel.Size.Height), this.Size.Height); //this.Size = new Size(this.Size.Width+(expPrnSetting.Size.Width-expPrnSetting.TitlePanel.Size.Height), this.Size.Height);
//else //else
this.Size = new Size(this.Size.Width - (expPrnSetting.Size.Width - expPrnSetting.TitlePanel.Size.Height), this.Size.Height); this.Size = new Size(this.Size.Width-(expPrnSetting.Size.Width-expPrnSetting.TitlePanel.Size.Height), this.Size.Height);
//Refresh(); //Refresh();
} }
@@ -1337,12 +1334,12 @@ namespace VEPROMS
{ {
DateTime dtStart = DateTime.Now; DateTime dtStart = DateTime.Now;
_MergedPfd = new MergedPdf(PDFPath, _DocVersionInfo); _MergedPfd = new MergedPdf(PDFPath, _DocVersionInfo);
PromsPrinter.MergedLandscapePages = null; // B2019-152: MergedLandscapePages has data set when creating separate pdfs (DoCreatePDF) PromsPrinter.MergedLandscapePages = null; // B2019-152: MergedLandscapePages has data set when creating separate pdfs (DoCreatePDF)
DoCreatePDF(); // create indivitual pdfs DoCreatePDF(); // create indivitual pdfs
if (_MergedPdfPath != null && _MergedPdfPath != PDFPath) PDFPath = _MergedPfd.Folder = _MergedPdfPath; if (_MergedPdfPath != null && _MergedPdfPath != PDFPath) PDFPath = _MergedPfd.Folder = _MergedPdfPath;
// C2021-063 pass in whether to generate Alarm Point List text when a merge is done // C2021-063 pass in whether to generate Alarm Point List text when a merge is done
if (!_MergedPfd.DoTheMerge(PromsPrinter.MergedLandscapePages, cbxAlmPtTxt.Checked)) return; // merge them together. if (!_MergedPfd.DoTheMerge(PromsPrinter.MergedLandscapePages,cbxAlmPtTxt.Checked)) return; // merge them together.
// if the property to show the file after printing is set (on the version dialog), display it. Otherwise do a dialog to let user know it's done // if the property to show the file after printing is set (on the version dialog), display it. Otherwise do a dialog to let user know it's done
if (_DocVersionConfig.Print_MergedPdfsViewAfter) if (_DocVersionConfig.Print_MergedPdfsViewAfter)
{ {
if (_MergedPfd.MergedPdfs != null && _MergedPfd.MergedPdfs.Count > 0) if (_MergedPfd.MergedPdfs != null && _MergedPfd.MergedPdfs.Count > 0)

View File

@@ -22148,8 +22148,84 @@ AS
[Folders].[FormatID]=@FormatID [Folders].[FormatID]=@FormatID
RETURN RETURN
GO
IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[vesp_ListUnlinkedItems]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
DROP PROCEDURE [vesp_ListUnlinkedItems];
GO
/*****************************************************************************
Volian Enterprises - Proprietary Information - DO NOT COPY OR DISTRIBUTE
Copyright 2024 - Volian Enterprises, Inc. All rights reserved.
*****************************************************************************/
/*
==========================================================================================================
Author: Kathy Ruffing
Create Date: 03/27/2024
Description: B2024-018: Gets list of procedures/sections/steps for possible enhanced linking
==========================================================================================================
*/
Create Procedure[dbo].[vesp_ListUnlinkedItems]
(
@ItemID int,
@EnhType int
)
WITH EXECUTE AS OWNER
AS
BEGIN
DECLARE @ParItemID int
DECLARE @EItemID int
set @EItemID = (select top 1 VIS.EItemID from vefn_AllSiblingItems(@ItemID)--Find All Siblings
outer apply vefn_GetNewEnhancedData(ItemID,@EnhType) VIS -- That are Linked
where EitemID is not null)
if @EItemID is null
BEGIN
select @EItemID = epp.ItemID
from (select * from Parts where ItemID in(select itemID from vefn_AllSiblingItems(@ItemID)))SPP -- FindParent
JOIN ITEMS SII ON sPP.ContentID = sII.ContentID -- Get Parent Content ID
outer apply vefn_GetNewEnhancedData(SII.ItemID,@EnhType) VIS -- Get Enhanced ID for Parent
JOIN ITEMS EII ON VIS.EItemID = EII.ItemID -- Get Enhanced Parent Content ID
JOIN PARTS EPP ON EPP.ContentID = EII.ContentID and SPP.FromType = epp.FromType -- Get first Child
END
if @EItemID is null -- B2024-018: If not found at the current level, check at the parent level
BEGIN
select @ParItemID = dbo.ve_getparentitem(@ItemID)
select @EItemID = epp.ItemID
from (select * from Parts where ItemID in(select itemID from vefn_AllSiblingItems(@ParItemID)))SPP -- FindParent
JOIN ITEMS SII ON sPP.ContentID = sII.ContentID -- Get Parent Content ID
outer apply vefn_GetNewEnhancedData(SII.ItemID,@EnhType) VIS -- Get Enhanced ID for Parent
JOIN ITEMS EII ON VIS.EItemID = EII.ItemID -- Get Enhanced Parent Content ID
JOIN PARTS EPP ON EPP.ContentID = EII.ContentID --and SPP.FromType = epp.FromType (had to remove types may be proc/sect)
END
if @EItemID is null
BEGIN
select @EItemID = DV2.ItemID from (select *,cast(config as xml) xconfig from DocVersions
where ItemID in(select itemID from vefn_AllSiblingItems(@ItemID))) SDV -- Source DocVersion
cross apply (select * from vefn_GetEnhancedDocVersions(SDV.VersionID) where @EnhType = Type) EDV -- Enhanced DocVersion
Join DocVersions DV2 ON DV2.VersionID = EDV.VersionID -- First Procedure
END
Select ItemID,PreviousID,II.ContentID,II.[DTS],II.[UserID],II.[LastChanged],
(SELECT COUNT(*) FROM [Annotations] WHERE [Annotations].[ItemID]=[II].[ItemID]) [AnnotationCount],
(SELECT COUNT(*) FROM [DocVersions] WHERE [DocVersions].[ItemID]=[II].[ItemID]) [DocVersionCount],
(SELECT COUNT(*) FROM [Items] [Children] WHERE [Children].[PreviousID]=[II].[ItemID]) [NextCount],
(SELECT COUNT(*) FROM [Parts] WHERE [Parts].[ItemID]=[II].[ItemID]) [PartCount],
(SELECT COUNT(*) FROM [Transitions] WHERE [Transitions].[RangeID]=[II].[ItemID]) [Transition_RangeIDCount],
(SELECT COUNT(*) FROM [Transitions] WHERE [Transitions].[ToID]=[II].[ItemID]) [Transition_ToIDCount]
from Items II
Left Join Entries EE ON II.ContentID = EE.ContentID
where ItemID In (select SIB.ItemID from vefn_AllSiblingItems(@EItemID) SIB
outer apply vefn_GetNewEnhancedData(ItemID,0) VIE
Where VIE.EItemID is null)
and EE.ContentID is null
END
Go
IF (@@Error = 0) PRINT 'Procedure Creation: [vesp_ListUnlinkedItems] Succeeded'
ELSE PRINT 'Procedure Creation: [vesp_ListUnlinkedItems] Error on Creation'
GO
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
/* /*
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
@@ -22184,8 +22260,8 @@ BEGIN TRY -- Try Block
DECLARE @RevDate varchar(255) DECLARE @RevDate varchar(255)
DECLARE @RevDescription varchar(255) DECLARE @RevDescription varchar(255)
set @RevDate = '10/03/2023 11:00 AM' set @RevDate = '03/27/2024 11:00 AM'
set @RevDescription = 'C2023-017: Added logic to filter the format list when selecting a format to be applied to a section' set @RevDescription = 'B2024-018: Enhanced link issue with sub-sections in source but not in enhanced'
Select cast(@RevDate as datetime) RevDate, @RevDescription RevDescription Select cast(@RevDate as datetime) RevDate, @RevDescription RevDescription
PRINT 'SQL Code Revision ' + @RevDate + ' - ' + @RevDescription PRINT 'SQL Code Revision ' + @RevDate + ' - ' + @RevDescription

File diff suppressed because it is too large Load Diff

View File

@@ -1,92 +0,0 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("PROMS")]
[assembly: AssemblyDescription("Create, Edit, and Maintain Procedures Sets.")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Volian Enterprises, Inc.")]
[assembly: AssemblyProduct("PROMS")]
[assembly: AssemblyCopyright("Copyright © 2012. All Rights Reserved.")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("2ffeb031-bf85-4153-baa2-2d4da2fd5556")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build YYMM (two digit year, two digit month)
// Revision DHH (day - no leading zero, two digit hour - military time
//
[assembly: AssemblyVersion("11.6.1205.316")]
[assembly: AssemblyFileVersion("11.6.1205.316")]

View File

@@ -0,0 +1,2 @@
da3d5d14-691f-4908-aa3c-fd3239734232;-8584908724854775808;VkVQUk9NUy5leGU=;ZGEzZDVkMTQtNjkxZi00OTA4LWFhM2MtZmQzMjM5NzM0MjMy,MjQyNzYxODZYWFhYWFhYWDAzNg,Sk9ITi1XSU4xMA,RmFsc2U,ODg0Mw,RmFsc2U,MA,MA,djIwMjQuMQ,,;PxeAWRi6mhDqvUMfJhk9Tniu/8ZnOLQv64hLh05xWM+MPyBs3yYfs3vEn5TLW779QNr1k8F6tV3gOAoLG+JSPZoG3NXmdTe6LJya05W+zWyb0H+jj2ReXN2dNR9fbZNDd3ClAeuzNpsM0pw62aYpOe2Tp6fx9gOFx1/0g8g4/8g
da3d5d14-691f-4908-aa3c-fd3239734232;-8584865524854775808;VkVQUk9NUy5leGU=;ZGEzZDVkMTQtNjkxZi00OTA4LWFhM2MtZmQzMjM5NzM0MjMy,NjE5MDczODdYWFhYWFhYWDA1Mw,Q0hSSVM,RmFsc2U,ODg5NA,RmFsc2U,MA,MA,djIwMjQuMQ,,;luo/kWHt4XRAYR+3s8m8QoRagBcvXLv0mHvCYU2VCIeACFord4tdtTGmSUvmGhEmUiAd7YvaTlDlFrlni6CWaVlxa1mdbWuWsNVUkRnyJZ8kOAt1A+3SGfHecCsqotTW7apXjwW5qXLZ/fcgutioe7xaXgniFQysshTdUWt26T8

View File

@@ -19,7 +19,7 @@
</SccAuxPath> </SccAuxPath>
<SccProvider> <SccProvider>
</SccProvider> </SccProvider>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<FileUpgradeFlags> <FileUpgradeFlags>
</FileUpgradeFlags> </FileUpgradeFlags>
<UpgradeBackupLocation> <UpgradeBackupLocation>
@@ -99,12 +99,7 @@
<Prefer32Bit>false</Prefer32Bit> <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="C1.Win.C1FlexGrid.2, Version=2.0.20162.188, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL"> <Reference Include="C1.Win.C1FlexGrid.2, Version=2.0.20213.532, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL" />
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="C1.Win.C1SpellChecker.2, Version=2.0.20162.188, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="Csla"> <Reference Include="Csla">
<HintPath>..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll</HintPath> <HintPath>..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll</HintPath>
</Reference> </Reference>
@@ -139,6 +134,7 @@
<Reference Include="System.Web.Extensions" /> <Reference Include="System.Web.Extensions" />
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
<Reference Include="UIAutomationProvider" />
<Reference Include="VEPROMS.CSLA.Library, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="VEPROMS.CSLA.Library, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\VEPROMS.CSLA.Library\bin\Debug\VEPROMS.CSLA.Library.dll</HintPath> <HintPath>..\VEPROMS.CSLA.Library\bin\Debug\VEPROMS.CSLA.Library.dll</HintPath>
@@ -427,6 +423,7 @@
<Compile Include="VlnWeb.Designer.cs"> <Compile Include="VlnWeb.Designer.cs">
<DependentUpon>VlnWeb.cs</DependentUpon> <DependentUpon>VlnWeb.cs</DependentUpon>
</Compile> </Compile>
<EmbeddedResource Include="VEPROMS.gclicx" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="Resources\Separator.png" /> <None Include="Resources\Separator.png" />

View File

@@ -99,6 +99,10 @@ namespace VEPROMS
MyProcedure = procedureInfo; MyProcedure = procedureInfo;
InitializeComponent(); InitializeComponent();
this.Text = mode + " Dialog for " + procedureInfo.DisplayNumber; this.Text = mode + " Dialog for " + procedureInfo.DisplayNumber;
//Preset path for single procedures.
PEIPath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + @"\VEPROMS\PEI_" + Database.VEPROMS_SqlConnection.Database;
txtExport.Text = string.Format(@"{0}\{1}.pxml", PEIPath, MyProcedure.DisplayNumber.Replace("/", "_").Replace("\\", "_"));
} }
private void dlgExportImport_Load(object sender, EventArgs e) private void dlgExportImport_Load(object sender, EventArgs e)
{ {
@@ -172,6 +176,7 @@ namespace VEPROMS
} }
else if (MyProcedure != null) else if (MyProcedure != null)
{ {
txtExport.Enabled = true;
txtExport.Text = string.Format(@"{0}\{1}.pxml", PEIPath, MyProcedure.DisplayNumber.Replace("/", "_").Replace("\\", "_")); txtExport.Text = string.Format(@"{0}\{1}.pxml", PEIPath, MyProcedure.DisplayNumber.Replace("/", "_").Replace("\\", "_"));
} }
} }
@@ -190,6 +195,8 @@ namespace VEPROMS
private bool successfullExport = true; private bool successfullExport = true;
private void btnDoExport_Click(object sender, EventArgs e) private void btnDoExport_Click(object sender, EventArgs e)
{ {
btnExport.Enabled = false; btnExport.Enabled = false;
string msg = "Finished Exporting:\n\n"; string msg = "Finished Exporting:\n\n";
if (_MyMode.ToUpper().Contains("FORMAT")) if (_MyMode.ToUpper().Contains("FORMAT"))
@@ -220,6 +227,42 @@ namespace VEPROMS
} }
else if (MyProcedure != null) else if (MyProcedure != null)
{ {
var fileLocation = txtExport.Text;
if (File.Exists(fileLocation))
{ // C2022-029 if an existing export of the same name is found, provide option to overwrite it
DialogResult ovewriteEx = FlexibleMessageBox.ShowCustom(null, "There is already another export file with the same name. You can choose to either overwrite the existing file or have the existing file renamed with the original creation date appended.\r\n\r\nSelecting 'Cancel' will cancel the export.", "What would you like to do?", MessageBoxButtons.OKCancel, MessageBoxIcon.Question);// == DialogResult.Yes;
// Extract directory, filename, and extension
string directory = Path.GetDirectoryName(fileLocation);
string filename = Path.GetFileNameWithoutExtension(fileLocation);
string extension = Path.GetExtension(fileLocation);
fileLocation = $"{directory}\\{filename}{extension}";
if (ovewriteEx == DialogResult.Abort)
{
MessageBox.Show("Export has been cancelled", "You have chosen to cancel the export.", MessageBoxButtons.OK, MessageBoxIcon.Information); // C2020-042 changed mesage box title
btnCloseExport.Enabled = true;
return;
}
else if (ovewriteEx == DialogResult.Retry)
{
//Overwrite will occur, set msg.
msg = "The export file has been overwritten. ";
}
else if (ovewriteEx == DialogResult.Ignore)
{
// Get the modified date of the existing file, create a datestamp for use in name, set newlocation to move to
DateTime modifiedDate = File.GetLastWriteTime(fileLocation);
string datestamp = modifiedDate.ToString("yyyyMMddHHmmss");
string newFileLocation = $"{directory}\\{filename}_{datestamp}{extension}";
//Move and set msg.
File.Move(fileLocation, newFileLocation);
msg = "The previous export has been renamed, the export file has been created. ";
}
}
this.Cursor = Cursors.WaitCursor; this.Cursor = Cursors.WaitCursor;
MyStart = DateTime.Now; MyStart = DateTime.Now;
btnDoExport.Enabled = false; btnDoExport.Enabled = false;
@@ -230,7 +273,7 @@ namespace VEPROMS
XmlElement xe = xd.CreateElement("formats"); XmlElement xe = xd.CreateElement("formats");
xd.DocumentElement.AppendChild(xe); xd.DocumentElement.AppendChild(xe);
ExportFormats(FormatInfoList.GetFormatInfoListUsed(), xe, "formats", false); ExportFormats(FormatInfoList.GetFormatInfoListUsed(), xe, "formats", false);
xd.Save(txtExport.Text); xd.Save(fileLocation);
TimeSpan elapsed = DateTime.Now.Subtract(MyStart); TimeSpan elapsed = DateTime.Now.Subtract(MyStart);
lblExportStatus.Text = "Export Completed in " + elapsed.ToString(); lblExportStatus.Text = "Export Completed in " + elapsed.ToString();
this.Cursor = Cursors.Default; this.Cursor = Cursors.Default;
@@ -706,7 +749,7 @@ namespace VEPROMS
} }
catch (Exception ex) catch (Exception ex)
{ {
FlexibleMessageBox.Show("The import failed, check the error log for more information.", "Import Failed", MessageBoxButtons.OK, MessageBoxIcon.Exclamation); FlexibleMessageBox.Show(null, "The import failed, check the error log for more information.", "Import Failed", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
_MyLog.Warn("Failure During Import", ex); _MyLog.Warn("Failure During Import", ex);
} }
return false; return false;

View File

@@ -400,6 +400,7 @@ namespace VEPROMS
this.pnlImport.PerformLayout(); this.pnlImport.PerformLayout();
this.ResumeLayout(false); this.ResumeLayout(false);
} }
#endregion #endregion

View File

@@ -57,7 +57,7 @@
this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.btnCancel.Location = new System.Drawing.Point(165, 111); this.btnCancel.Location = new System.Drawing.Point(179, 111);
this.btnCancel.Name = "btnCancel"; this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(64, 23); this.btnCancel.Size = new System.Drawing.Size(64, 23);
this.btnCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -88,7 +88,7 @@
this.dateTimeInput1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.dateTimeInput1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.dateTimeInput1.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; this.dateTimeInput1.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown;
this.dateTimeInput1.ButtonDropDown.Visible = true; this.dateTimeInput1.ButtonDropDown.Visible = true;
this.dateTimeInput1.CustomFormat = "MM/dd/yyyy"; this.dateTimeInput1.CustomFormat = "MM/dd/yyyy HH:mm:ss";
this.dateTimeInput1.DateTimeSelectorVisibility = DevComponents.Editors.DateTimeAdv.eDateTimeSelectorVisibility.DateSelector; this.dateTimeInput1.DateTimeSelectorVisibility = DevComponents.Editors.DateTimeAdv.eDateTimeSelectorVisibility.DateSelector;
this.dateTimeInput1.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; this.dateTimeInput1.Format = DevComponents.Editors.eDateTimePickerFormat.Custom;
this.dateTimeInput1.IsPopupCalendarOpen = false; this.dateTimeInput1.IsPopupCalendarOpen = false;
@@ -122,7 +122,7 @@
this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.dateTimeInput1.MonthCalendar.TodayButtonVisible = true; this.dateTimeInput1.MonthCalendar.TodayButtonVisible = true;
this.dateTimeInput1.Name = "dateTimeInput1"; this.dateTimeInput1.Name = "dateTimeInput1";
this.dateTimeInput1.Size = new System.Drawing.Size(113, 20); this.dateTimeInput1.Size = new System.Drawing.Size(146, 20);
this.dateTimeInput1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.dateTimeInput1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.superTooltip1.SetSuperTooltip(this.dateTimeInput1, new DevComponents.DotNetBar.SuperTooltipInfo("Change Bar Start Date", "", "Only the changes made after this date will have change bars.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(138, 67))); this.superTooltip1.SetSuperTooltip(this.dateTimeInput1, new DevComponents.DotNetBar.SuperTooltipInfo("Change Bar Start Date", "", "Only the changes made after this date will have change bars.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(138, 67)));
this.dateTimeInput1.TabIndex = 4; this.dateTimeInput1.TabIndex = 4;
@@ -133,7 +133,7 @@
// //
this.btnNow.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnNow.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
this.btnNow.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnNow.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
this.btnNow.Location = new System.Drawing.Point(149, 51); this.btnNow.Location = new System.Drawing.Point(182, 51);
this.btnNow.Name = "btnNow"; this.btnNow.Name = "btnNow";
this.btnNow.Size = new System.Drawing.Size(49, 23); this.btnNow.Size = new System.Drawing.Size(49, 23);
this.btnNow.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnNow.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -146,7 +146,7 @@
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(241, 144); this.ClientSize = new System.Drawing.Size(268, 144);
this.Controls.Add(this.btnNow); this.Controls.Add(this.btnNow);
this.Controls.Add(this.dateTimeInput1); this.Controls.Add(this.dateTimeInput1);
this.Controls.Add(this.label1); this.Controls.Add(this.label1);

View File

@@ -32,13 +32,46 @@ namespace VEPROMS
{ {
string cbdt = MyProcConfig.Print_ChangeBarDate; string cbdt = MyProcConfig.Print_ChangeBarDate;
string[] tmp = cbdt.Split(' '); string[] tmp = cbdt.Split(' ');
cbdt = tmp[0] + " 00:00:00";
dateTimeInput1.Value = (cbdt == null || cbdt == "") ? DateTime.Now : DateTime.Parse(cbdt); if (tmp[0] == null || tmp[0] == "") // First time date set.
{
cbdt = DateTime.Now.ToString("MM/dd/yyyy") + " " + DateTime.Now.ToString("HH:mm:ss");
dateTimeInput1.Value = DateTime.Parse(cbdt);
return;
}
else
{
DateTime tmpdt = DateTime.Parse(cbdt);
if (tmpdt.Date == DateTime.Today) // Date has before been set.
{
TimeSpan start = TimeSpan.Parse("00:00:00");
var time = tmpdt.TimeOfDay;
if (start < time) // If time is greater than 12:00:00 AM
{
cbdt = DateTime.Now.ToString("MM/dd/yyyy") + " " + tmpdt.TimeOfDay.ToString();
dateTimeInput1.Value = DateTime.Parse(cbdt);
return;
}
else // if time is 12:00:00 AM
{
cbdt = DateTime.Now.ToString("MM/dd/yyyy") + " " + " 00:00:00";
dateTimeInput1.Value = DateTime.Parse(cbdt);
return;
}
}
else
{
cbdt = tmpdt.ToString();
dateTimeInput1.Value = DateTime.Parse(cbdt);
return;
}
}
} }
private void btnOK_Click(object sender, EventArgs e) private void btnOK_Click(object sender, EventArgs e)
{ {
MyProcConfig.Print_ChangeBarDate = dateTimeInput1.Value.ToString("MM/dd/yyyy 00:00:00");// ("MM/dd/yyyy HH:mm:ss"); MyProcConfig.Print_ChangeBarDate = dateTimeInput1.Value.ToString("MM/dd/yyyy HH:mm:ss");// ("MM/dd/yyyy HH:mm:ss");
} }

View File

@@ -112,12 +112,12 @@
<value>2.0</value> <value>2.0</value>
</resheader> </resheader>
<resheader name="reader"> <resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value> <value>17, 17</value>
</metadata> </metadata>
</root> </root>

View File

@@ -52,6 +52,24 @@
this.expandableSplitter1 = new DevComponents.DotNetBar.ExpandableSplitter(); this.expandableSplitter1 = new DevComponents.DotNetBar.ExpandableSplitter();
this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.panelEx1 = new DevComponents.DotNetBar.PanelEx();
this.sideNav1 = new DevComponents.DotNetBar.Controls.SideNav(); this.sideNav1 = new DevComponents.DotNetBar.Controls.SideNav();
this.sideNavPanel4 = new DevComponents.DotNetBar.Controls.SideNavPanel();
this.swDeleteFolder = new DevComponents.DotNetBar.Controls.SwitchButton();
this.labelX13 = new DevComponents.DotNetBar.LabelX();
this.swDeleteAnnotations = new DevComponents.DotNetBar.Controls.SwitchButton();
this.labelX14 = new DevComponents.DotNetBar.LabelX();
this.myTVdel = new System.Windows.Forms.TreeView();
this.btnDeleteItems = new DevComponents.DotNetBar.ButtonX();
this.sideNavPanel3 = new DevComponents.DotNetBar.Controls.SideNavPanel();
this.swCheckROLinks = new DevComponents.DotNetBar.Controls.SwitchButton();
this.labelX12 = new DevComponents.DotNetBar.LabelX();
this.warningBox5 = new DevComponents.DotNetBar.Controls.WarningBox();
this.line3 = new DevComponents.DotNetBar.Controls.Line();
this.swUpdateROVals = new DevComponents.DotNetBar.Controls.SwitchButton();
this.swRefreshTrans = new DevComponents.DotNetBar.Controls.SwitchButton();
this.labelX11 = new DevComponents.DotNetBar.LabelX();
this.labelX6 = new DevComponents.DotNetBar.LabelX();
this.warningBox1 = new DevComponents.DotNetBar.Controls.WarningBox();
this.btnFixLinks = new DevComponents.DotNetBar.ButtonX();
this.sideNavPanel2 = new DevComponents.DotNetBar.Controls.SideNavPanel(); this.sideNavPanel2 = new DevComponents.DotNetBar.Controls.SideNavPanel();
this.swRefreshTblsForSrch = new DevComponents.DotNetBar.Controls.SwitchButton(); this.swRefreshTblsForSrch = new DevComponents.DotNetBar.Controls.SwitchButton();
this.lblRefreshTblForSrch = new DevComponents.DotNetBar.LabelX(); this.lblRefreshTblForSrch = new DevComponents.DotNetBar.LabelX();
@@ -79,25 +97,14 @@
this.swCkOrphanDataRecs = new DevComponents.DotNetBar.Controls.SwitchButton(); this.swCkOrphanDataRecs = new DevComponents.DotNetBar.Controls.SwitchButton();
this.labelX1 = new DevComponents.DotNetBar.LabelX(); this.labelX1 = new DevComponents.DotNetBar.LabelX();
this.btnRunCheck = new DevComponents.DotNetBar.ButtonX(); this.btnRunCheck = new DevComponents.DotNetBar.ButtonX();
this.sideNavPanel3 = new DevComponents.DotNetBar.Controls.SideNavPanel();
this.swCheckROLinks = new DevComponents.DotNetBar.Controls.SwitchButton();
this.labelX12 = new DevComponents.DotNetBar.LabelX();
this.warningBox5 = new DevComponents.DotNetBar.Controls.WarningBox();
this.line3 = new DevComponents.DotNetBar.Controls.Line();
this.swUpdateROVals = new DevComponents.DotNetBar.Controls.SwitchButton();
this.swRefreshTrans = new DevComponents.DotNetBar.Controls.SwitchButton();
this.labelX11 = new DevComponents.DotNetBar.LabelX();
this.labelX6 = new DevComponents.DotNetBar.LabelX();
this.warningBox1 = new DevComponents.DotNetBar.Controls.WarningBox();
this.btnFixLinks = new DevComponents.DotNetBar.ButtonX();
this.sideNavPanel4 = new DevComponents.DotNetBar.Controls.SideNavPanel();
this.btn_ShowUsers = new DevComponents.DotNetBar.ButtonX();
this.sideNavItem1 = new DevComponents.DotNetBar.Controls.SideNavItem(); this.sideNavItem1 = new DevComponents.DotNetBar.Controls.SideNavItem();
this.separator1 = new DevComponents.DotNetBar.Separator(); this.separator1 = new DevComponents.DotNetBar.Separator();
this.sideNavItmCheck = new DevComponents.DotNetBar.Controls.SideNavItem(); this.sideNavItmCheck = new DevComponents.DotNetBar.Controls.SideNavItem();
this.sideNavItmRepair = new DevComponents.DotNetBar.Controls.SideNavItem(); this.sideNavItmRepair = new DevComponents.DotNetBar.Controls.SideNavItem();
this.sideNavItmLinks = new DevComponents.DotNetBar.Controls.SideNavItem(); this.sideNavItmLinks = new DevComponents.DotNetBar.Controls.SideNavItem();
this.sideNavItmUsers = new DevComponents.DotNetBar.Controls.SideNavItem(); this.sideNavItmUsers = new DevComponents.DotNetBar.Controls.SideNavItem();
this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem();
this.sideNavItemDelete = new DevComponents.DotNetBar.Controls.SideNavItem();
this.sideNavItmExit = new DevComponents.DotNetBar.Controls.SideNavItem(); this.sideNavItmExit = new DevComponents.DotNetBar.Controls.SideNavItem();
this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx();
this.progressSteps1 = new DevComponents.DotNetBar.ProgressSteps(); this.progressSteps1 = new DevComponents.DotNetBar.ProgressSteps();
@@ -118,10 +125,10 @@
this.pnlLater.SuspendLayout(); this.pnlLater.SuspendLayout();
this.panelEx1.SuspendLayout(); this.panelEx1.SuspendLayout();
this.sideNav1.SuspendLayout(); this.sideNav1.SuspendLayout();
this.sideNavPanel4.SuspendLayout();
this.sideNavPanel3.SuspendLayout();
this.sideNavPanel2.SuspendLayout(); this.sideNavPanel2.SuspendLayout();
this.sideNavPanel1.SuspendLayout(); this.sideNavPanel1.SuspendLayout();
this.sideNavPanel3.SuspendLayout();
this.sideNavPanel4.SuspendLayout();
this.panelEx4.SuspendLayout(); this.panelEx4.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
@@ -133,7 +140,7 @@
this.myTV.CheckBoxes = true; this.myTV.CheckBoxes = true;
this.myTV.Location = new System.Drawing.Point(0, 230); this.myTV.Location = new System.Drawing.Point(0, 230);
this.myTV.Name = "myTV"; this.myTV.Name = "myTV";
this.myTV.Size = new System.Drawing.Size(300, 264); this.myTV.Size = new System.Drawing.Size(170, 218);
this.myTV.TabIndex = 4; this.myTV.TabIndex = 4;
this.myTV.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.myTV_AfterCheck); this.myTV.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.myTV_AfterCheck);
// //
@@ -343,7 +350,7 @@
this.pnlLater.Controls.Add(this.dtpDate); this.pnlLater.Controls.Add(this.dtpDate);
this.pnlLater.Dock = System.Windows.Forms.DockStyle.Top; this.pnlLater.Dock = System.Windows.Forms.DockStyle.Top;
this.pnlLater.Enabled = false; this.pnlLater.Enabled = false;
this.pnlLater.Location = new System.Drawing.Point(6, 23); this.pnlLater.Location = new System.Drawing.Point(6, 27);
this.pnlLater.Name = "pnlLater"; this.pnlLater.Name = "pnlLater";
this.pnlLater.Padding = new System.Windows.Forms.Padding(6); this.pnlLater.Padding = new System.Windows.Forms.Padding(6);
this.pnlLater.Size = new System.Drawing.Size(279, 37); this.pnlLater.Size = new System.Drawing.Size(279, 37);
@@ -384,7 +391,7 @@
this.chkLater.Dock = System.Windows.Forms.DockStyle.Top; this.chkLater.Dock = System.Windows.Forms.DockStyle.Top;
this.chkLater.Location = new System.Drawing.Point(6, 6); this.chkLater.Location = new System.Drawing.Point(6, 6);
this.chkLater.Name = "chkLater"; this.chkLater.Name = "chkLater";
this.chkLater.Size = new System.Drawing.Size(279, 17); this.chkLater.Size = new System.Drawing.Size(279, 21);
this.chkLater.TabIndex = 4; this.chkLater.TabIndex = 4;
this.chkLater.Text = "Process Later"; this.chkLater.Text = "Process Later";
this.chkLater.UseVisualStyleBackColor = true; this.chkLater.UseVisualStyleBackColor = true;
@@ -457,10 +464,10 @@
// sideNav1 // sideNav1
// //
this.sideNav1.BackColor = System.Drawing.SystemColors.Control; this.sideNav1.BackColor = System.Drawing.SystemColors.Control;
this.sideNav1.Controls.Add(this.sideNavPanel1);
this.sideNav1.Controls.Add(this.sideNavPanel3); this.sideNav1.Controls.Add(this.sideNavPanel3);
this.sideNav1.Controls.Add(this.sideNavPanel2); this.sideNav1.Controls.Add(this.sideNavPanel1);
this.sideNav1.Controls.Add(this.sideNavPanel4); this.sideNav1.Controls.Add(this.sideNavPanel4);
this.sideNav1.Controls.Add(this.sideNavPanel2);
this.sideNav1.Dock = System.Windows.Forms.DockStyle.Fill; this.sideNav1.Dock = System.Windows.Forms.DockStyle.Fill;
this.sideNav1.EnableClose = false; this.sideNav1.EnableClose = false;
this.sideNav1.EnableMaximize = false; this.sideNav1.EnableMaximize = false;
@@ -471,6 +478,7 @@
this.sideNavItmRepair, this.sideNavItmRepair,
this.sideNavItmLinks, this.sideNavItmLinks,
this.sideNavItmUsers, this.sideNavItmUsers,
this.sideNavItemDelete,
this.sideNavItmExit}); this.sideNavItmExit});
this.sideNav1.Location = new System.Drawing.Point(0, 0); this.sideNav1.Location = new System.Drawing.Point(0, 0);
this.sideNav1.Name = "sideNav1"; this.sideNav1.Name = "sideNav1";
@@ -479,6 +487,297 @@
this.sideNav1.TabIndex = 3; this.sideNav1.TabIndex = 3;
this.sideNav1.Text = "sideNav1"; this.sideNav1.Text = "sideNav1";
// //
// sideNavPanel4
//
this.sideNavPanel4.Controls.Add(this.swDeleteFolder);
this.sideNavPanel4.Controls.Add(this.labelX13);
this.sideNavPanel4.Controls.Add(this.swDeleteAnnotations);
this.sideNavPanel4.Controls.Add(this.labelX14);
this.sideNavPanel4.Controls.Add(this.myTVdel);
this.sideNavPanel4.Controls.Add(this.btnDeleteItems);
this.sideNavPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
this.sideNavPanel4.Location = new System.Drawing.Point(102, 39);
this.sideNavPanel4.Name = "sideNavPanel4";
this.sideNavPanel4.Size = new System.Drawing.Size(278, 486);
this.sideNavPanel4.TabIndex = 27;
this.sideNavPanel4.Visible = false;
//
// swDeleteFolder
//
//
//
//
this.swDeleteFolder.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.swDeleteFolder.Location = new System.Drawing.Point(10, 43);
this.swDeleteFolder.Name = "swDeleteFolder";
this.swDeleteFolder.Size = new System.Drawing.Size(69, 22);
this.swDeleteFolder.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.superTooltip1.SetSuperTooltip(this.swDeleteFolder, new DevComponents.DotNetBar.SuperTooltipInfo("Check RO Links", "", resources.GetString("swDeleteFolder.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 150)));
this.swDeleteFolder.SwitchClickTogglesValue = true;
this.swDeleteFolder.TabIndex = 39;
this.swDeleteFolder.ValueChanged += new System.EventHandler(this.swDeleteFolder_ValueChanged);
//
// labelX13
//
this.labelX13.BackColor = System.Drawing.Color.Transparent;
//
//
//
this.labelX13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.labelX13.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.labelX13.Location = new System.Drawing.Point(85, 42);
this.labelX13.Name = "labelX13";
this.labelX13.Size = new System.Drawing.Size(168, 22);
this.superTooltip1.SetSuperTooltip(this.labelX13, new DevComponents.DotNetBar.SuperTooltipInfo("Check RO Links", "", resources.GetString("labelX13.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(350, 175)));
this.labelX13.TabIndex = 38;
this.labelX13.Text = "Delete Folders";
//
// swDeleteAnnotations
//
//
//
//
this.swDeleteAnnotations.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.swDeleteAnnotations.Location = new System.Drawing.Point(10, 15);
this.swDeleteAnnotations.Name = "swDeleteAnnotations";
this.swDeleteAnnotations.Size = new System.Drawing.Size(69, 22);
this.swDeleteAnnotations.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.superTooltip1.SetSuperTooltip(this.swDeleteAnnotations, new DevComponents.DotNetBar.SuperTooltipInfo("Refresh Transitions", "", resources.GetString("swDeleteAnnotations.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(265, 175)));
this.swDeleteAnnotations.SwitchClickTogglesValue = true;
this.swDeleteAnnotations.TabIndex = 37;
this.swDeleteAnnotations.Value = true;
this.swDeleteAnnotations.ValueObject = "Y";
this.swDeleteAnnotations.ValueChanged += new System.EventHandler(this.swDeleteAnnotations_ValueChanged);
//
// labelX14
//
this.labelX14.BackColor = System.Drawing.Color.Transparent;
//
//
//
this.labelX14.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.labelX14.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.labelX14.Location = new System.Drawing.Point(85, 14);
this.labelX14.Name = "labelX14";
this.labelX14.Size = new System.Drawing.Size(186, 22);
this.superTooltip1.SetSuperTooltip(this.labelX14, new DevComponents.DotNetBar.SuperTooltipInfo("Refresh Transitions", "", resources.GetString("labelX14.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(256, 175)));
this.labelX14.TabIndex = 36;
this.labelX14.Text = "Delete Annotations";
//
// myTVdel
//
this.myTVdel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.myTVdel.CheckBoxes = true;
this.myTVdel.Location = new System.Drawing.Point(14, 145);
this.myTVdel.Name = "myTVdel";
this.myTVdel.Size = new System.Drawing.Size(254, 323);
this.myTVdel.TabIndex = 34;
//
// btnDeleteItems
//
this.btnDeleteItems.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
this.btnDeleteItems.Checked = true;
this.btnDeleteItems.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
this.btnDeleteItems.Location = new System.Drawing.Point(3, 98);
this.btnDeleteItems.Name = "btnDeleteItems";
this.btnDeleteItems.Size = new System.Drawing.Size(280, 23);
this.btnDeleteItems.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.superTooltip1.SetSuperTooltip(this.btnDeleteItems, new DevComponents.DotNetBar.SuperTooltipInfo("Process Links", "", "This will run the selected RO Links or Transitions Links tool.\r\n\r\nClick on the on" +
"/off switches to turn on/off each tool.\r\n\r\nNote that only one of these tools can" +
" be run at a time.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 130)));
this.btnDeleteItems.TabIndex = 35;
this.btnDeleteItems.Text = "Process Deletions";
this.btnDeleteItems.Click += new System.EventHandler(this.btnDeleteItems_Click);
//
// sideNavPanel3
//
this.sideNavPanel3.Controls.Add(this.swCheckROLinks);
this.sideNavPanel3.Controls.Add(this.labelX12);
this.sideNavPanel3.Controls.Add(this.warningBox5);
this.sideNavPanel3.Controls.Add(this.line3);
this.sideNavPanel3.Controls.Add(this.swUpdateROVals);
this.sideNavPanel3.Controls.Add(this.swRefreshTrans);
this.sideNavPanel3.Controls.Add(this.labelX11);
this.sideNavPanel3.Controls.Add(this.labelX6);
this.sideNavPanel3.Controls.Add(this.warningBox1);
this.sideNavPanel3.Controls.Add(this.myTV);
this.sideNavPanel3.Controls.Add(this.btnFixLinks);
this.sideNavPanel3.Dock = System.Windows.Forms.DockStyle.Fill;
this.sideNavPanel3.Location = new System.Drawing.Point(102, 39);
this.sideNavPanel3.Name = "sideNavPanel3";
this.sideNavPanel3.Size = new System.Drawing.Size(278, 486);
this.sideNavPanel3.TabIndex = 10;
//
// swCheckROLinks
//
//
//
//
this.swCheckROLinks.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.swCheckROLinks.Location = new System.Drawing.Point(10, 66);
this.swCheckROLinks.Name = "swCheckROLinks";
this.swCheckROLinks.Size = new System.Drawing.Size(91, 22);
this.swCheckROLinks.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.superTooltip1.SetSuperTooltip(this.swCheckROLinks, new DevComponents.DotNetBar.SuperTooltipInfo("Check RO Links", "", resources.GetString("swCheckROLinks.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 150)));
this.swCheckROLinks.SwitchClickTogglesValue = true;
this.swCheckROLinks.TabIndex = 33;
this.swCheckROLinks.ValueChanged += new System.EventHandler(this.swCheckROLinks_ValueChanged);
//
// labelX12
//
this.labelX12.BackColor = System.Drawing.Color.Transparent;
//
//
//
this.labelX12.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.labelX12.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.labelX12.Location = new System.Drawing.Point(107, 66);
this.labelX12.Name = "labelX12";
this.labelX12.Size = new System.Drawing.Size(186, 22);
this.superTooltip1.SetSuperTooltip(this.labelX12, new DevComponents.DotNetBar.SuperTooltipInfo("Check RO Links", "", resources.GetString("labelX12.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(350, 175)));
this.labelX12.TabIndex = 32;
this.labelX12.Text = "Check RO Links";
//
// warningBox5
//
this.warningBox5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(196)))), ((int)(((byte)(219)))), ((int)(((byte)(249)))));
this.warningBox5.CloseButtonVisible = false;
this.warningBox5.Image = ((System.Drawing.Image)(resources.GetObject("warningBox5.Image")));
this.warningBox5.Location = new System.Drawing.Point(17, 145);
this.warningBox5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.warningBox5.Name = "warningBox5";
this.warningBox5.OptionsButtonVisible = false;
this.warningBox5.Size = new System.Drawing.Size(262, 32);
this.warningBox5.TabIndex = 31;
this.warningBox5.Text = "<b>NOTE</b> These tools can take a long time to run";
//
// line3
//
this.line3.BackColor = System.Drawing.Color.Transparent;
this.line3.Location = new System.Drawing.Point(6, 127);
this.line3.Name = "line3";
this.line3.Size = new System.Drawing.Size(285, 12);
this.line3.TabIndex = 30;
this.line3.Text = "line3";
//
// swUpdateROVals
//
//
//
//
this.swUpdateROVals.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.swUpdateROVals.Location = new System.Drawing.Point(10, 10);
this.swUpdateROVals.Name = "swUpdateROVals";
this.swUpdateROVals.Size = new System.Drawing.Size(91, 22);
this.swUpdateROVals.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.superTooltip1.SetSuperTooltip(this.swUpdateROVals, new DevComponents.DotNetBar.SuperTooltipInfo("Update RO Values", "", resources.GetString("swUpdateROVals.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 150)));
this.swUpdateROVals.SwitchClickTogglesValue = true;
this.swUpdateROVals.TabIndex = 29;
this.swUpdateROVals.Value = true;
this.swUpdateROVals.ValueObject = "Y";
this.swUpdateROVals.ValueChanged += new System.EventHandler(this.swUpdateROVals_ValueChanged);
//
// swRefreshTrans
//
//
//
//
this.swRefreshTrans.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.swRefreshTrans.Location = new System.Drawing.Point(10, 38);
this.swRefreshTrans.Name = "swRefreshTrans";
this.swRefreshTrans.Size = new System.Drawing.Size(91, 22);
this.swRefreshTrans.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.superTooltip1.SetSuperTooltip(this.swRefreshTrans, new DevComponents.DotNetBar.SuperTooltipInfo("Refresh Transitions", "", resources.GetString("swRefreshTrans.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(265, 175)));
this.swRefreshTrans.SwitchClickTogglesValue = true;
this.swRefreshTrans.TabIndex = 29;
this.swRefreshTrans.ValueChanged += new System.EventHandler(this.swRefreshTrans_ValueChanged);
//
// labelX11
//
this.labelX11.BackColor = System.Drawing.Color.Transparent;
//
//
//
this.labelX11.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.labelX11.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.labelX11.Location = new System.Drawing.Point(107, 10);
this.labelX11.Name = "labelX11";
this.labelX11.Size = new System.Drawing.Size(186, 22);
this.superTooltip1.SetSuperTooltip(this.labelX11, new DevComponents.DotNetBar.SuperTooltipInfo("Update RO Values", "", resources.GetString("labelX11.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 150)));
this.labelX11.TabIndex = 28;
this.labelX11.Text = "Update RO Values";
//
// labelX6
//
this.labelX6.BackColor = System.Drawing.Color.Transparent;
//
//
//
this.labelX6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.labelX6.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.labelX6.Location = new System.Drawing.Point(107, 38);
this.labelX6.Name = "labelX6";
this.labelX6.Size = new System.Drawing.Size(186, 22);
this.superTooltip1.SetSuperTooltip(this.labelX6, new DevComponents.DotNetBar.SuperTooltipInfo("Refresh Transitions", "", resources.GetString("labelX6.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(256, 175)));
this.labelX6.TabIndex = 28;
this.labelX6.Text = "Refresh Transitions";
//
// warningBox1
//
this.warningBox1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(196)))), ((int)(((byte)(219)))), ((int)(((byte)(249)))));
this.warningBox1.CloseButtonVisible = false;
this.warningBox1.Image = ((System.Drawing.Image)(resources.GetObject("warningBox1.Image")));
this.warningBox1.Location = new System.Drawing.Point(17, 181);
this.warningBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.warningBox1.Name = "warningBox1";
this.warningBox1.OptionsButtonVisible = false;
this.warningBox1.Size = new System.Drawing.Size(262, 43);
this.warningBox1.TabIndex = 7;
this.warningBox1.Text = " Be sure there is a current backup of the \r\n database prior to running these func" +
"tions";
//
// btnFixLinks
//
this.btnFixLinks.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
this.btnFixLinks.Checked = true;
this.btnFixLinks.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
this.btnFixLinks.Location = new System.Drawing.Point(10, 98);
this.btnFixLinks.Name = "btnFixLinks";
this.btnFixLinks.Size = new System.Drawing.Size(280, 23);
this.btnFixLinks.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.superTooltip1.SetSuperTooltip(this.btnFixLinks, new DevComponents.DotNetBar.SuperTooltipInfo("Process Links", "", "This will run the selected RO Links or Transitions Links tool.\r\n\r\nClick on the on" +
"/off switches to turn on/off each tool.\r\n\r\nNote that only one of these tools can" +
" be run at a time.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 130)));
this.btnFixLinks.TabIndex = 6;
this.btnFixLinks.Text = "Process Links";
this.btnFixLinks.Click += new System.EventHandler(this.btnFixLinks_Click);
//
// sideNavPanel2
//
this.sideNavPanel2.Controls.Add(this.swRefreshTblsForSrch);
this.sideNavPanel2.Controls.Add(this.lblRefreshTblForSrch);
this.sideNavPanel2.Controls.Add(this.warningBox4);
this.sideNavPanel2.Controls.Add(this.warningBox2);
this.sideNavPanel2.Controls.Add(this.swRmObsoleteROData);
this.sideNavPanel2.Controls.Add(this.swRefreshWordAttmts);
this.sideNavPanel2.Controls.Add(this.swStandardHypenChars);
this.sideNavPanel2.Controls.Add(this.labelX4);
this.sideNavPanel2.Controls.Add(this.labelX5);
this.sideNavPanel2.Controls.Add(this.labelX9);
this.sideNavPanel2.Controls.Add(this.swRmOrphanDataRecs);
this.sideNavPanel2.Controls.Add(this.labelX10);
this.sideNavPanel2.Controls.Add(this.labelX8);
this.sideNavPanel2.Controls.Add(this.line2);
this.sideNavPanel2.Controls.Add(this.btnRunRepair);
this.sideNavPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
this.sideNavPanel2.Location = new System.Drawing.Point(102, 39);
this.sideNavPanel2.Name = "sideNavPanel2";
this.sideNavPanel2.Size = new System.Drawing.Size(278, 486);
this.sideNavPanel2.TabIndex = 6;
this.sideNavPanel2.Visible = false;
//
// swRefreshTblsForSrch // swRefreshTblsForSrch
// //
// //
@@ -517,6 +816,7 @@
this.warningBox4.CloseButtonVisible = false; this.warningBox4.CloseButtonVisible = false;
this.warningBox4.Image = ((System.Drawing.Image)(resources.GetObject("warningBox4.Image"))); this.warningBox4.Image = ((System.Drawing.Image)(resources.GetObject("warningBox4.Image")));
this.warningBox4.Location = new System.Drawing.Point(12, 264); this.warningBox4.Location = new System.Drawing.Point(12, 264);
this.warningBox4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.warningBox4.Name = "warningBox4"; this.warningBox4.Name = "warningBox4";
this.warningBox4.OptionsButtonVisible = false; this.warningBox4.OptionsButtonVisible = false;
this.warningBox4.Size = new System.Drawing.Size(264, 32); this.warningBox4.Size = new System.Drawing.Size(264, 32);
@@ -529,6 +829,7 @@
this.warningBox2.CloseButtonVisible = false; this.warningBox2.CloseButtonVisible = false;
this.warningBox2.Image = ((System.Drawing.Image)(resources.GetObject("warningBox2.Image"))); this.warningBox2.Image = ((System.Drawing.Image)(resources.GetObject("warningBox2.Image")));
this.warningBox2.Location = new System.Drawing.Point(12, 302); this.warningBox2.Location = new System.Drawing.Point(12, 302);
this.warningBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.warningBox2.Name = "warningBox2"; this.warningBox2.Name = "warningBox2";
this.warningBox2.OptionsButtonVisible = false; this.warningBox2.OptionsButtonVisible = false;
this.warningBox2.Size = new System.Drawing.Size(264, 43); this.warningBox2.Size = new System.Drawing.Size(264, 43);
@@ -698,7 +999,7 @@
this.btnRunRepair.Size = new System.Drawing.Size(280, 23); this.btnRunRepair.Size = new System.Drawing.Size(280, 23);
this.btnRunRepair.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnRunRepair.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.superTooltip1.SetSuperTooltip(this.btnRunRepair, new DevComponents.DotNetBar.SuperTooltipInfo("Run Repair", "", "This will run the database repair tools selected.\r\n\r\nClick on the on/off switches" + this.superTooltip1.SetSuperTooltip(this.btnRunRepair, new DevComponents.DotNetBar.SuperTooltipInfo("Run Repair", "", "This will run the database repair tools selected.\r\n\r\nClick on the on/off switches" +
" to turn on/off each tool.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 103))); " to turn on/off each tool.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 103)));
this.btnRunRepair.TabIndex = 3; this.btnRunRepair.TabIndex = 3;
this.btnRunRepair.Text = "Run Repair"; this.btnRunRepair.Text = "Run Repair";
this.btnRunRepair.Click += new System.EventHandler(this.btnRunRepair_Click); this.btnRunRepair.Click += new System.EventHandler(this.btnRunRepair_Click);
@@ -716,10 +1017,11 @@
this.sideNavPanel1.Controls.Add(this.labelX1); this.sideNavPanel1.Controls.Add(this.labelX1);
this.sideNavPanel1.Controls.Add(this.btnRunCheck); this.sideNavPanel1.Controls.Add(this.btnRunCheck);
this.sideNavPanel1.Dock = System.Windows.Forms.DockStyle.Fill; this.sideNavPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.sideNavPanel1.Location = new System.Drawing.Point(80, 31); this.sideNavPanel1.Location = new System.Drawing.Point(102, 39);
this.sideNavPanel1.Name = "sideNavPanel1"; this.sideNavPanel1.Name = "sideNavPanel1";
this.sideNavPanel1.Size = new System.Drawing.Size(300, 494); this.sideNavPanel1.Size = new System.Drawing.Size(278, 486);
this.sideNavPanel1.TabIndex = 2; this.sideNavPanel1.TabIndex = 2;
this.sideNavPanel1.Visible = false;
// //
// warningBox3 // warningBox3
// //
@@ -727,6 +1029,7 @@
this.warningBox3.CloseButtonVisible = false; this.warningBox3.CloseButtonVisible = false;
this.warningBox3.Image = ((System.Drawing.Image)(resources.GetObject("warningBox3.Image"))); this.warningBox3.Image = ((System.Drawing.Image)(resources.GetObject("warningBox3.Image")));
this.warningBox3.Location = new System.Drawing.Point(17, 207); this.warningBox3.Location = new System.Drawing.Point(17, 207);
this.warningBox3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.warningBox3.Name = "warningBox3"; this.warningBox3.Name = "warningBox3";
this.warningBox3.OptionsButtonVisible = false; this.warningBox3.OptionsButtonVisible = false;
this.warningBox3.Size = new System.Drawing.Size(264, 32); this.warningBox3.Size = new System.Drawing.Size(264, 32);
@@ -868,248 +1171,6 @@
this.btnRunCheck.Text = "Run Check"; this.btnRunCheck.Text = "Run Check";
this.btnRunCheck.Click += new System.EventHandler(this.btnRunCheck_Click); this.btnRunCheck.Click += new System.EventHandler(this.btnRunCheck_Click);
// //
// sideNavPanel3
//
this.sideNavPanel3.Controls.Add(this.swCheckROLinks);
this.sideNavPanel3.Controls.Add(this.labelX12);
this.sideNavPanel3.Controls.Add(this.warningBox5);
this.sideNavPanel3.Controls.Add(this.line3);
this.sideNavPanel3.Controls.Add(this.swUpdateROVals);
this.sideNavPanel3.Controls.Add(this.swRefreshTrans);
this.sideNavPanel3.Controls.Add(this.labelX11);
this.sideNavPanel3.Controls.Add(this.labelX6);
this.sideNavPanel3.Controls.Add(this.warningBox1);
this.sideNavPanel3.Controls.Add(this.myTV);
this.sideNavPanel3.Controls.Add(this.btnFixLinks);
this.sideNavPanel3.Dock = System.Windows.Forms.DockStyle.Fill;
this.sideNavPanel3.Location = new System.Drawing.Point(80, 31);
this.sideNavPanel3.Name = "sideNavPanel3";
this.sideNavPanel3.Size = new System.Drawing.Size(300, 494);
this.sideNavPanel3.TabIndex = 10;
this.sideNavPanel3.Visible = false;
//
// swCheckROLinks
//
//
//
//
this.swCheckROLinks.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.swCheckROLinks.Location = new System.Drawing.Point(10, 66);
this.swCheckROLinks.Name = "swCheckROLinks";
this.swCheckROLinks.Size = new System.Drawing.Size(91, 22);
this.swCheckROLinks.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.superTooltip1.SetSuperTooltip(this.swCheckROLinks, new DevComponents.DotNetBar.SuperTooltipInfo("Check RO Links", "", resources.GetString("swCheckROLinks.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 150)));
this.swCheckROLinks.SwitchClickTogglesValue = true;
this.swCheckROLinks.TabIndex = 33;
this.swCheckROLinks.ValueChanged += new System.EventHandler(this.swCheckROLinks_ValueChanged);
//
// labelX12
//
this.labelX12.BackColor = System.Drawing.Color.Transparent;
//
//
//
this.labelX12.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.labelX12.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.labelX12.Location = new System.Drawing.Point(107, 66);
this.labelX12.Name = "labelX12";
this.labelX12.Size = new System.Drawing.Size(186, 22);
this.superTooltip1.SetSuperTooltip(this.labelX12, new DevComponents.DotNetBar.SuperTooltipInfo("Check RO Links", "", resources.GetString("labelX12.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(350, 175)));
this.labelX12.TabIndex = 32;
this.labelX12.Text = "Check RO Links";
//
// warningBox5
//
this.warningBox5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(196)))), ((int)(((byte)(219)))), ((int)(((byte)(249)))));
this.warningBox5.CloseButtonVisible = false;
this.warningBox5.Image = ((System.Drawing.Image)(resources.GetObject("warningBox5.Image")));
this.warningBox5.Location = new System.Drawing.Point(17, 145);
this.warningBox5.Name = "warningBox5";
this.warningBox5.OptionsButtonVisible = false;
this.warningBox5.Size = new System.Drawing.Size(262, 32);
this.warningBox5.TabIndex = 31;
this.warningBox5.Text = "<b>NOTE</b> These tools can take a long time to run";
//
// line3
//
this.line3.BackColor = System.Drawing.Color.Transparent;
this.line3.Location = new System.Drawing.Point(6, 127);
this.line3.Name = "line3";
this.line3.Size = new System.Drawing.Size(285, 12);
this.line3.TabIndex = 30;
this.line3.Text = "line3";
//
// swUpdateROVals
//
//
//
//
this.swUpdateROVals.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.swUpdateROVals.Location = new System.Drawing.Point(10, 10);
this.swUpdateROVals.Name = "swUpdateROVals";
this.swUpdateROVals.Size = new System.Drawing.Size(91, 22);
this.swUpdateROVals.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.superTooltip1.SetSuperTooltip(this.swUpdateROVals, new DevComponents.DotNetBar.SuperTooltipInfo("Update RO Values", "", resources.GetString("swUpdateROVals.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 150)));
this.swUpdateROVals.SwitchClickTogglesValue = true;
this.swUpdateROVals.TabIndex = 29;
this.swUpdateROVals.Value = true;
this.swUpdateROVals.ValueObject = "Y";
this.swUpdateROVals.ValueChanged += new System.EventHandler(this.swUpdateROVals_ValueChanged);
//
// swRefreshTrans
//
//
//
//
this.swRefreshTrans.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.swRefreshTrans.Location = new System.Drawing.Point(10, 38);
this.swRefreshTrans.Name = "swRefreshTrans";
this.swRefreshTrans.Size = new System.Drawing.Size(91, 22);
this.swRefreshTrans.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.superTooltip1.SetSuperTooltip(this.swRefreshTrans, new DevComponents.DotNetBar.SuperTooltipInfo("Refresh Transitions", "", resources.GetString("swRefreshTrans.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(265, 175)));
this.swRefreshTrans.SwitchClickTogglesValue = true;
this.swRefreshTrans.TabIndex = 29;
this.swRefreshTrans.ValueChanged += new System.EventHandler(this.swRefreshTrans_ValueChanged);
//
// labelX11
//
this.labelX11.BackColor = System.Drawing.Color.Transparent;
//
//
//
this.labelX11.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.labelX11.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.labelX11.Location = new System.Drawing.Point(107, 10);
this.labelX11.Name = "labelX11";
this.labelX11.Size = new System.Drawing.Size(186, 22);
this.superTooltip1.SetSuperTooltip(this.labelX11, new DevComponents.DotNetBar.SuperTooltipInfo("Update RO Values", "", resources.GetString("labelX11.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 150)));
this.labelX11.TabIndex = 28;
this.labelX11.Text = "Update RO Values";
//
// labelX6
//
this.labelX6.BackColor = System.Drawing.Color.Transparent;
//
//
//
this.labelX6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.labelX6.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.labelX6.Location = new System.Drawing.Point(107, 38);
this.labelX6.Name = "labelX6";
this.labelX6.Size = new System.Drawing.Size(186, 22);
this.superTooltip1.SetSuperTooltip(this.labelX6, new DevComponents.DotNetBar.SuperTooltipInfo("Refresh Transitions", "", resources.GetString("labelX6.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(256, 175)));
this.labelX6.TabIndex = 28;
this.labelX6.Text = "Refresh Transitions";
//
// warningBox1
//
this.warningBox1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(196)))), ((int)(((byte)(219)))), ((int)(((byte)(249)))));
this.warningBox1.CloseButtonVisible = false;
this.warningBox1.Image = ((System.Drawing.Image)(resources.GetObject("warningBox1.Image")));
this.warningBox1.Location = new System.Drawing.Point(17, 181);
this.warningBox1.Name = "warningBox1";
this.warningBox1.OptionsButtonVisible = false;
this.warningBox1.Size = new System.Drawing.Size(262, 43);
this.warningBox1.TabIndex = 7;
this.warningBox1.Text = " Be sure there is a current backup of the \r\n database prior to running these func" +
"tions";
//
// btnFixLinks
//
this.btnFixLinks.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
this.btnFixLinks.Checked = true;
this.btnFixLinks.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
this.btnFixLinks.Location = new System.Drawing.Point(10, 98);
this.btnFixLinks.Name = "btnFixLinks";
this.btnFixLinks.Size = new System.Drawing.Size(280, 23);
this.btnFixLinks.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.superTooltip1.SetSuperTooltip(this.btnFixLinks, new DevComponents.DotNetBar.SuperTooltipInfo("Process Links", "", "This will run the selected RO Links or Transitions Links tool.\r\n\r\nClick on the on" +
"/off switches to turn on/off each tool.\r\n\r\nNote that only one of these tools can" +
" be run at a time.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 130)));
this.btnFixLinks.TabIndex = 6;
this.btnFixLinks.Text = "Process Links";
this.btnFixLinks.Click += new System.EventHandler(this.btnFixLinks_Click);
//
// sideNavPanel2
//
this.sideNavPanel2.Controls.Add(this.swRefreshTblsForSrch);
this.sideNavPanel2.Controls.Add(this.lblRefreshTblForSrch);
this.sideNavPanel2.Controls.Add(this.warningBox4);
this.sideNavPanel2.Controls.Add(this.warningBox2);
this.sideNavPanel2.Controls.Add(this.swRmObsoleteROData);
this.sideNavPanel2.Controls.Add(this.swRefreshWordAttmts);
this.sideNavPanel2.Controls.Add(this.swStandardHypenChars);
this.sideNavPanel2.Controls.Add(this.labelX4);
this.sideNavPanel2.Controls.Add(this.labelX5);
this.sideNavPanel2.Controls.Add(this.labelX9);
this.sideNavPanel2.Controls.Add(this.swRmOrphanDataRecs);
this.sideNavPanel2.Controls.Add(this.labelX10);
this.sideNavPanel2.Controls.Add(this.labelX8);
this.sideNavPanel2.Controls.Add(this.line2);
this.sideNavPanel2.Controls.Add(this.btnRunRepair);
this.sideNavPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
this.sideNavPanel2.Location = new System.Drawing.Point(80, 31);
this.sideNavPanel2.Name = "sideNavPanel2";
this.sideNavPanel2.Size = new System.Drawing.Size(300, 494);
this.sideNavPanel2.TabIndex = 6;
this.sideNavPanel2.Visible = false;
//
// swRefreshTblsForSrch
//
//
//
//
this.swRefreshTblsForSrch.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.swRefreshTblsForSrch.Location = new System.Drawing.Point(10, 153);
this.swRefreshTblsForSrch.Name = "swRefreshTblsForSrch";
this.swRefreshTblsForSrch.Size = new System.Drawing.Size(91, 22);
this.swRefreshTblsForSrch.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.superTooltip1.SetSuperTooltip(this.swRefreshTblsForSrch, new DevComponents.DotNetBar.SuperTooltipInfo("Refresh Word Attachments", "", resources.GetString("swRefreshTblsForSrch.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(300, 200)));
this.swRefreshTblsForSrch.SwitchClickTogglesValue = true;
this.swRefreshTblsForSrch.TabIndex = 32;
this.swRefreshTblsForSrch.Value = true;
this.swRefreshTblsForSrch.ValueObject = "Y";
//
// lblRefreshTblForSrch
//
this.lblRefreshTblForSrch.BackColor = System.Drawing.Color.Transparent;
//
//
//
this.lblRefreshTblForSrch.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.lblRefreshTblForSrch.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblRefreshTblForSrch.Location = new System.Drawing.Point(107, 153);
this.lblRefreshTblForSrch.Name = "lblRefreshTblForSrch";
this.lblRefreshTblForSrch.Size = new System.Drawing.Size(186, 22);
this.superTooltip1.SetSuperTooltip(this.lblRefreshTblForSrch, new DevComponents.DotNetBar.SuperTooltipInfo("Refresh Word Attachments", "", resources.GetString("lblRefreshTblForSrch.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(300, 200)));
this.lblRefreshTblForSrch.TabIndex = 31;
this.lblRefreshTblForSrch.Text = "Refresh Tables For Search";
//
// sideNavPanel4
//
this.sideNavPanel4.Controls.Add(this.btn_ShowUsers);
this.sideNavPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
this.sideNavPanel4.Location = new System.Drawing.Point(81, 31);
this.sideNavPanel4.Name = "sideNavPanel4";
this.sideNavPanel4.Size = new System.Drawing.Size(299, 494);
this.sideNavPanel4.TabIndex = 14;
this.sideNavPanel4.Visible = false;
//
// btn_ShowUsers
//
this.btn_ShowUsers.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
this.btn_ShowUsers.Checked = true;
this.btn_ShowUsers.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
this.btn_ShowUsers.Location = new System.Drawing.Point(57, 37);
this.btn_ShowUsers.Name = "btn_ShowUsers";
this.btn_ShowUsers.Size = new System.Drawing.Size(171, 23);
this.btn_ShowUsers.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.superTooltip1.SetSuperTooltip(this.btn_ShowUsers, new DevComponents.DotNetBar.SuperTooltipInfo("Show Users", "", "This will return all of the users currently with open sessions in the database an" +
"d the details of any items they have checked out.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 80)));
this.btn_ShowUsers.TabIndex = 0;
this.btn_ShowUsers.Text = "Show Users";
this.btn_ShowUsers.Click += new System.EventHandler(this.btn_ShowUsers_Click);
//
// sideNavItem1 // sideNavItem1
// //
this.sideNavItem1.IsSystemMenu = true; this.sideNavItem1.IsSystemMenu = true;
@@ -1129,7 +1190,6 @@
// //
// sideNavItmCheck // sideNavItmCheck
// //
this.sideNavItmCheck.Checked = true;
this.sideNavItmCheck.Name = "sideNavItmCheck"; this.sideNavItmCheck.Name = "sideNavItmCheck";
this.sideNavItmCheck.Panel = this.sideNavPanel1; this.sideNavItmCheck.Panel = this.sideNavPanel1;
this.sideNavItmCheck.Symbol = ""; this.sideNavItmCheck.Symbol = "";
@@ -1146,6 +1206,7 @@
// //
// sideNavItmLinks // sideNavItmLinks
// //
this.sideNavItmLinks.Checked = true;
this.sideNavItmLinks.Name = "sideNavItmLinks"; this.sideNavItmLinks.Name = "sideNavItmLinks";
this.sideNavItmLinks.Panel = this.sideNavPanel3; this.sideNavItmLinks.Panel = this.sideNavPanel3;
this.sideNavItmLinks.Symbol = ""; this.sideNavItmLinks.Symbol = "";
@@ -1155,11 +1216,25 @@
// sideNavItmUsers // sideNavItmUsers
// //
this.sideNavItmUsers.Name = "sideNavItmUsers"; this.sideNavItmUsers.Name = "sideNavItmUsers";
this.sideNavItmUsers.Panel = this.sideNavPanel4; this.sideNavItmUsers.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
this.buttonItem1});
this.sideNavItmUsers.Symbol = ""; this.sideNavItmUsers.Symbol = "";
this.sideNavItmUsers.Text = "Users"; this.sideNavItmUsers.Text = "Users";
this.sideNavItmUsers.Click += new System.EventHandler(this.sideNavItmUsers_Click); this.sideNavItmUsers.Click += new System.EventHandler(this.sideNavItmUsers_Click);
// //
// buttonItem1
//
this.buttonItem1.Name = "buttonItem1";
this.buttonItem1.Text = "buttonItem1";
//
// sideNavItemDelete
//
this.sideNavItemDelete.Name = "sideNavItemDelete";
this.sideNavItemDelete.Panel = this.sideNavPanel4;
this.sideNavItemDelete.Symbol = "";
this.sideNavItemDelete.Text = "Delete";
this.sideNavItemDelete.Click += new System.EventHandler(this.sideNavItemDelete_Click_1);
//
// sideNavItmExit // sideNavItmExit
// //
this.sideNavItmExit.Name = "sideNavItmExit"; this.sideNavItmExit.Name = "sideNavItmExit";
@@ -1286,11 +1361,10 @@
this.panelEx1.ResumeLayout(false); this.panelEx1.ResumeLayout(false);
this.sideNav1.ResumeLayout(false); this.sideNav1.ResumeLayout(false);
this.sideNav1.PerformLayout(); this.sideNav1.PerformLayout();
this.sideNavPanel4.ResumeLayout(false);
this.sideNavPanel3.ResumeLayout(false);
this.sideNavPanel2.ResumeLayout(false); this.sideNavPanel2.ResumeLayout(false);
this.sideNavPanel1.ResumeLayout(false); this.sideNavPanel1.ResumeLayout(false);
this.sideNavPanel3.ResumeLayout(false);
//this.sideNavPanel2.ResumeLayout(false);
this.sideNavPanel4.ResumeLayout(false);
this.panelEx4.ResumeLayout(false); this.panelEx4.ResumeLayout(false);
this.ResumeLayout(false); this.ResumeLayout(false);
@@ -1340,8 +1414,6 @@
private DevComponents.DotNetBar.LabelX labelX8; private DevComponents.DotNetBar.LabelX labelX8;
private DevComponents.DotNetBar.Controls.Line line2; private DevComponents.DotNetBar.Controls.Line line2;
private DevComponents.DotNetBar.ButtonX btnRunRepair; private DevComponents.DotNetBar.ButtonX btnRunRepair;
private DevComponents.DotNetBar.Controls.SideNavPanel sideNavPanel4;
private DevComponents.DotNetBar.ButtonX btn_ShowUsers;
private DevComponents.DotNetBar.Controls.SideNavPanel sideNavPanel3; private DevComponents.DotNetBar.Controls.SideNavPanel sideNavPanel3;
private DevComponents.DotNetBar.ButtonX btnFixLinks; private DevComponents.DotNetBar.ButtonX btnFixLinks;
private DevComponents.DotNetBar.Controls.SideNavItem sideNavItem1; private DevComponents.DotNetBar.Controls.SideNavItem sideNavItem1;
@@ -1376,5 +1448,14 @@
private DevComponents.DotNetBar.LabelX lblRefreshTblForSrch; private DevComponents.DotNetBar.LabelX lblRefreshTblForSrch;
private DevComponents.DotNetBar.Controls.SwitchButton swCheckROLinks; private DevComponents.DotNetBar.Controls.SwitchButton swCheckROLinks;
private DevComponents.DotNetBar.LabelX labelX12; private DevComponents.DotNetBar.LabelX labelX12;
private DevComponents.DotNetBar.ButtonItem buttonItem1;
private DevComponents.DotNetBar.Controls.SideNavPanel sideNavPanel4;
private DevComponents.DotNetBar.Controls.SwitchButton swDeleteFolder;
private DevComponents.DotNetBar.LabelX labelX13;
private DevComponents.DotNetBar.Controls.SwitchButton swDeleteAnnotations;
private DevComponents.DotNetBar.LabelX labelX14;
private System.Windows.Forms.TreeView myTVdel;
private DevComponents.DotNetBar.ButtonX btnDeleteItems;
private DevComponents.DotNetBar.Controls.SideNavItem sideNavItemDelete;
} }
} }

View File

@@ -125,6 +125,60 @@ namespace VEPROMS
myTV.SelectedNode.Expand(); myTV.SelectedNode.Expand();
this.Cursor = Cursors.Default; this.Cursor = Cursors.Default;
} }
private void ResetDelTV()
{
ResetDelTV(false);
}
private void ResetDelTV(bool noProcs)
{
btnFixLinks.Enabled = false;
this.Cursor = Cursors.WaitCursor;
myTVdel.Nodes.Clear();
myDocVersions.Clear();
FolderInfo fi = FolderInfo.GetTop();
if (fi.ChildFolderCount > 0)
{
if (noProcs)
{
LoadBottomLevelFolders(fi, myTVdel);
}
else
{
TreeNode tn = new TreeNode(fi.Name);
tn.Tag = fi;
tn.StateImageIndex = -1; // Hide the checkbox for the root node
LoadChildFolders(fi, tn, noProcs);
myTVdel.Nodes.Add(tn);
}
}
if (myTVdel.SelectedNode != null)
myTVdel.SelectedNode.Expand();
this.Cursor = Cursors.Default;
//btnFixLinks.Enabled = false;
//this.Cursor = Cursors.WaitCursor;
////myTreeNodePath = new List<string>();
//myTVdel.Nodes.Clear();
//myDocVersions.Clear();
//FolderInfo fi = FolderInfo.GetTop();
//TreeNode tn = myTVdel.Nodes.Add(fi.Name );
//tn.Tag = fi;
//if (fi.ChildFolderCount > 0)
//{
// if (noProcs)
// {
// LoadBottomLevelFolders(fi, myTVdel);
// }
// else
// LoadChildFolders(fi, tn, noProcs);
//}
//if (myTVdel.SelectedNode != null)
// myTVdel.SelectedNode.Expand();
//this.Cursor = Cursors.Default;
}
// B2021-060 Higher level folders where being removed from the tree even if there was a child folder that containe a working draft set // B2021-060 Higher level folders where being removed from the tree even if there was a child folder that containe a working draft set
private bool LoadChildFolders(FolderInfo fi, TreeNode tn, bool noProcs) private bool LoadChildFolders(FolderInfo fi, TreeNode tn, bool noProcs)
{ {
@@ -151,6 +205,34 @@ namespace VEPROMS
tn.Remove(); tn.Remove();
return loadedWorkingDraft; return loadedWorkingDraft;
} }
/// <summary>
/// Load only bottom layer of folders into treenode.
/// </summary>
/// <param name="fi"></param>
/// <param name="tn"></param>
private void LoadBottomLevelFolders(FolderInfo fi, TreeView treeView)
{
foreach (FolderInfo fic in fi.SortedChildFolders)
{
if (fic.ChildFolderCount > 0)
{
// Recursively call for child folders
LoadBottomLevelFolders(fic, treeView);
}
else
{
if (fic.Name != "PROMS")
{
// If the folder is a bottom-level folder (no child folders), add it directly to the TreeView
TreeNode tnc = treeView.Nodes.Add(fic.Name);
tnc.Tag = fic;
}
}
}
}
private bool LoadDocVersions(FolderInfo fic, TreeNode tnc, bool noProcs) private bool LoadDocVersions(FolderInfo fic, TreeNode tnc, bool noProcs)
{ {
bool rtnval = false; bool rtnval = false;
@@ -1246,6 +1328,21 @@ namespace VEPROMS
this.Close(); this.Close();
} }
// new Admin Tools user interface for deletes
private void sideNavItemDelete_Click(object sender, EventArgs e)
{
}
// new Admin Tools user interface for deletes
private void sideNavItemDelete_Click_1(object sender, EventArgs e)
{
if (swDeleteFolder.Value)
ResetDelTV(true);
else
ResetDelTV(false);
}
#region On/Off Swiches #region On/Off Swiches
// C2017-030 new Admin Tools user interface // C2017-030 new Admin Tools user interface
@@ -1500,5 +1597,107 @@ namespace VEPROMS
} }
} }
//C2024-005 Delete Annotations, Delete Folders
private void swDeleteAnnotations_ValueChanged(object sender, EventArgs e)
{
swDeleteFolder.Value = !swDeleteAnnotations.Value;
if (swDeleteFolder.Value)
ResetDelTV(true);
else
ResetDelTV(false);
}
private void swDeleteFolder_ValueChanged(object sender, EventArgs e)
{
swDeleteAnnotations.Value = !swDeleteFolder.Value;
if (swDeleteFolder.Value)
ResetDelTV(true);
else
ResetDelTV(false);
}
private void btnDeleteItems_Click(object sender, EventArgs e)
{
//clear
txtResults.Clear();
txtProcess.Clear();
if (swDeleteFolder.Value)
{
//TODO process deletions of folders
txtProcess.AppendText("Deleting Folders...");
//List<ProcedureInfo> pil = new List<ProcedureInfo>();
//foreach (TreeNode tn in myProcedures.Keys)
// if (tn.Checked)
// pil.Add(myProcedures[tn]);
////Load Selected Folders
//Dictionary<int, string> folderData = new Dictionary<int, string>();
//List<DocVersionInfo> dvil = new List<DocVersionInfo>();
//foreach (TreeNode tn in myTVdel.Nodes)
// if (tn.Checked)
// {
// tn.Tag = dvi;
// myDocVersions.Add(tn, dvi);
// }
////foreach (TreeNode tn in myTVdel.Nodes)
////{
//// if (tn.Checked)
//// {
//// var itemInfo = myProcedures[tn];
//// folderData.Add(itemInfo.ItemID, itemInfo.DisplayText);
//// }
////}
//ProcessDelete(dvil);
}
else
{
//TODO process deletions of annotations
txtProcess.AppendText("Deleting Annotations...");
}
}
private void ProcessDelete(List<DocVersionInfo> foldersToDelete)
{
DateTime pStart = DateTime.Now;
txtProcess.AppendText(Environment.NewLine);
txtProcess.AppendText(pStart.ToString("MM/dd/yyyy @ HH:mm"));
txtProcess.AppendText(Environment.NewLine);
foreach (var kvp in foldersToDelete)
{
int itemID = (int)kvp.ItemID;
string folderName = kvp.Name;
// Perform the deletion operation
// Assume DeleteFolderByID is a method that deletes the folder by its ItemID
bool deletionSuccessful = DeleteFolderByID(itemID);
// Update txtProcess with the progress
if (deletionSuccessful)
{
txtProcess.AppendText($"Successfully deleted folder: {folderName} (ID: {itemID})");
}
else
{
txtProcess.AppendText($"Failed to delete folder: {folderName} (ID: {itemID})");
}
txtProcess.AppendText(Environment.NewLine);
}
}
// Example deletion method
private bool DeleteFolderByID(int itemID)
{
// Implement your folder deletion logic here
// Return true if deletion was successful, false otherwise
return true; // Placeholder
}
} }
} }

View File

@@ -117,75 +117,9 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="warningBox3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAplJREFUOE+N
k11IU2Ecxv9zouK8CULrzo8SU3QKaSYmOJ2uFL8SK4igEIok6qKUwggySTShC41CRiiGdWNfYBcVWiGl
FqN0lh+UTaekzuWcuu2c9316nSdKLPEHz817/s/zPv9zOPQ/nlVQEGulF3ILPe+8SIHK8eYR5lusLwHy
Oy08RqpXjjfHVCMlsydbGbekg4/r4HmwRbLWUZzyeGNqD5NK1O5lw8L8NQHckgh5SAdXA3UqIxuzZKSj
8ssI8Il9wMQeYDoVfD4HrsdhsNdRgTL2b4yl5Ce1qL+xcQOWxpKxMzwAMVEayIv7IU8XwVnv8+XuEfJV
xtfjMlKZ/CYG3JYJ96wOPj6EoCBfMCkfnJdguSMG89eoVBlfS+tJCpCafa1stgBYzAZbzoFGo0ZIiD84
KwJ350P+UQxHtfr7vUPkp9j+4GqiM1K3FtyVB8h5wlSI4GB/RIQHgjtzwWaywMb1WHwYg7lKOq3YVrlz
jPw8RrWFOUoAJhpwcaNciNDQQMRGB4FNpIMNp4B93A2pXw/7ZbWlufCvFguNdNzzOta7J5S6fP4AdkVq
kKQVAQNJYO8TwHq0kD8kwdkWhZkLdMJrrsonlfu2yszmSsA9Bat1p0XdsTTcvxmJtpowyL1ar/m3PKYM
2MpVgzcySUWTdWRwd+wAXzoo3r5B7CnqDqVg+lW89yuoVARrR/SaANm0F46mUFjOUjYtN9BTaVQYJzPA
RlPB+hNF3XjvP3C9bDuqTm2D9DZuTcCKXN1psJ2ndhGgnpJGciENGyB9zoJk1kMezFonySw0oIf0KVOs
oIO7L3MlYITstVTsrKNHCzXU5aimnvmrZPp5hfrtlWS2X6LBuQoatJWTWQz3C5mEeoS6hNqt5yj7FysJ
zJwL4b/EAAAAAElFTkSuQmCC
</value>
</data>
<metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value> <value>17, 17</value>
</metadata> </metadata>
<data name="swCkObsoleteROData.SuperTooltip" xml:space="preserve">
<value>Referenced Objects databases are associated with a procedure set (such as Working Draft).
RO paths, ROFST versions, and the contents of RO figures are stored in the database when referenced. This tool will identify stored RO Paths, ROFST versions, and Figures that are no longer used.
</value>
</data>
<data name="swHiddenDataLocs.SuperTooltip" xml:space="preserve">
<value>Typically, a section in PROMS only has sub-sections or steps. When and existing section is divided into sub-sections, the resulting main section might have both.
When this occurs, the step data in the main section can be marked as non-editable. The user can no longer get to these steps and they can become forgotten as PROMS will ignore these non-editable steps when the procedure is printed.
This tool will identify if the database has non-editable steps and provide a listing of these steps. The use can then go to these main sections, make them editable via the property page, and delete or move these steps.
This tool may take an extended period of time to execute.
</value>
</data>
<data name="labelX3.SuperTooltip" xml:space="preserve">
<value>Referenced Objects databases are associated with a procedure set (such as Working Draft).
RO paths, ROFST versions, and the contents of RO figures are stored in the database when referenced. This tool will identify stored RO Paths, ROFST versions, and Figures that are no longer used.
</value>
</data>
<data name="labelX2.SuperTooltip" xml:space="preserve">
<value>Typically, a section in PROMS only has sub-sections or steps. When and existing section is divided into sub-sections, the resulting main section might have both.
When this occurs, the step data in the main section can be marked as non-editable. The user can no longer get to these steps and they can become forgotten as PROMS will ignore these non-editable steps when the procedure is printed.
This tool will identify if the database has non-editable steps and provide a listing of these steps. The use can then go to these main sections, make them editable via the property page, and delete or move these steps.
This tool may take an extended period of time to execute.
</value>
</data>
<data name="swCkOrphanDataRecs.SuperTooltip" xml:space="preserve">
<value>Everything in PROMS is inter-related. A working draft knows what is its first procedure and a procedure knows what is its first step. Likewise, a procedure knows what procedure is before it and after it.
Should an item become orphaned (disconnected) from the rest of the data, it will no longer be accessible. This tool detects any orphaned items in the database.
This tool may take an extended period of time to execute.
</value>
</data>
<data name="labelX1.SuperTooltip" xml:space="preserve">
<value>Everything in PROMS is inter-related. A working draft knows what is its first procedure and a procedure knows what is its first step. Likewise, a procedure knows what procedure is before it and after it.
Should an item become orphaned (disconnected) from the rest of the data, it will no longer be accessible. This tool detects any orphaned items in the database.
This tool may take an extended period of time to execute.
</value>
</data>
<data name="swCheckROLinks.SuperTooltip" xml:space="preserve"> <data name="swCheckROLinks.SuperTooltip" xml:space="preserve">
<value>This allows the user to check referenced objects links in procedure step data for multiple working drafts in a batch mode. <value>This allows the user to check referenced objects links in procedure step data for multiple working drafts in a batch mode.
@@ -207,6 +141,7 @@ Be sure a current backup of the database exists prior performing this function.
It is recommended that this be done during off hours. It is recommended that this be done during off hours.
</value> </value>
</data> </data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="warningBox5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="warningBox5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAplJREFUOE+N iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAplJREFUOE+N
@@ -270,6 +205,106 @@ If more than one procedure is selected, it is recommended that this be performed
oIO7L3MlYITstVTsrKNHCzXU5aimnvmrZPp5hfrtlWS2X6LBuQoatJWTWQz3C5mEeoS6hNqt5yj7FysJ oIO7L3MlYITstVTsrKNHCzXU5aimnvmrZPp5hfrtlWS2X6LBuQoatJWTWQz3C5mEeoS6hNqt5yj7FysJ
zJwL4b/EAAAAAElFTkSuQmCC zJwL4b/EAAAAAElFTkSuQmCC
</value> </value>
</data>
<data name="warningBox3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAplJREFUOE+N
k11IU2Ecxv9zouK8CULrzo8SU3QKaSYmOJ2uFL8SK4igEIok6qKUwggySTShC41CRiiGdWNfYBcVWiGl
FqN0lh+UTaekzuWcuu2c9316nSdKLPEHz817/s/zPv9zOPQ/nlVQEGulF3ILPe+8SIHK8eYR5lusLwHy
Oy08RqpXjjfHVCMlsydbGbekg4/r4HmwRbLWUZzyeGNqD5NK1O5lw8L8NQHckgh5SAdXA3UqIxuzZKSj
8ssI8Il9wMQeYDoVfD4HrsdhsNdRgTL2b4yl5Ce1qL+xcQOWxpKxMzwAMVEayIv7IU8XwVnv8+XuEfJV
xtfjMlKZ/CYG3JYJ96wOPj6EoCBfMCkfnJdguSMG89eoVBlfS+tJCpCafa1stgBYzAZbzoFGo0ZIiD84
KwJ350P+UQxHtfr7vUPkp9j+4GqiM1K3FtyVB8h5wlSI4GB/RIQHgjtzwWaywMb1WHwYg7lKOq3YVrlz
jPw8RrWFOUoAJhpwcaNciNDQQMRGB4FNpIMNp4B93A2pXw/7ZbWlufCvFguNdNzzOta7J5S6fP4AdkVq
kKQVAQNJYO8TwHq0kD8kwdkWhZkLdMJrrsonlfu2yszmSsA9Bat1p0XdsTTcvxmJtpowyL1ar/m3PKYM
2MpVgzcySUWTdWRwd+wAXzoo3r5B7CnqDqVg+lW89yuoVARrR/SaANm0F46mUFjOUjYtN9BTaVQYJzPA
RlPB+hNF3XjvP3C9bDuqTm2D9DZuTcCKXN1psJ2ndhGgnpJGciENGyB9zoJk1kMezFonySw0oIf0KVOs
oIO7L3MlYITstVTsrKNHCzXU5aimnvmrZPp5hfrtlWS2X6LBuQoatJWTWQz3C5mEeoS6hNqt5yj7FysJ
zJwL4b/EAAAAAElFTkSuQmCC
</value>
</data>
<data name="swCkObsoleteROData.SuperTooltip" xml:space="preserve">
<value>Referenced Objects databases are associated with a procedure set (such as Working Draft).
RO paths, ROFST versions, and the contents of RO figures are stored in the database when referenced. This tool will identify stored RO Paths, ROFST versions, and Figures that are no longer used.
</value>
</data>
<data name="swHiddenDataLocs.SuperTooltip" xml:space="preserve">
<value>Typically, a section in PROMS only has sub-sections or steps. When and existing section is divided into sub-sections, the resulting main section might have both.
When this occurs, the step data in the main section can be marked as non-editable. The user can no longer get to these steps and they can become forgotten as PROMS will ignore these non-editable steps when the procedure is printed.
This tool will identify if the database has non-editable steps and provide a listing of these steps. The use can then go to these main sections, make them editable via the property page, and delete or move these steps.
This tool may take an extended period of time to execute.
</value>
</data>
<data name="labelX3.SuperTooltip" xml:space="preserve">
<value>Referenced Objects databases are associated with a procedure set (such as Working Draft).
RO paths, ROFST versions, and the contents of RO figures are stored in the database when referenced. This tool will identify stored RO Paths, ROFST versions, and Figures that are no longer used.
</value>
</data>
<data name="labelX2.SuperTooltip" xml:space="preserve">
<value>Typically, a section in PROMS only has sub-sections or steps. When and existing section is divided into sub-sections, the resulting main section might have both.
When this occurs, the step data in the main section can be marked as non-editable. The user can no longer get to these steps and they can become forgotten as PROMS will ignore these non-editable steps when the procedure is printed.
This tool will identify if the database has non-editable steps and provide a listing of these steps. The use can then go to these main sections, make them editable via the property page, and delete or move these steps.
This tool may take an extended period of time to execute.
</value>
</data>
<data name="swCkOrphanDataRecs.SuperTooltip" xml:space="preserve">
<value>Everything in PROMS is inter-related. A working draft knows what is its first procedure and a procedure knows what is its first step. Likewise, a procedure knows what procedure is before it and after it.
Should an item become orphaned (disconnected) from the rest of the data, it will no longer be accessible. This tool detects any orphaned items in the database.
This tool may take an extended period of time to execute.
</value>
</data>
<data name="labelX1.SuperTooltip" xml:space="preserve">
<value>Everything in PROMS is inter-related. A working draft knows what is its first procedure and a procedure knows what is its first step. Likewise, a procedure knows what procedure is before it and after it.
Should an item become orphaned (disconnected) from the rest of the data, it will no longer be accessible. This tool detects any orphaned items in the database.
This tool may take an extended period of time to execute.
</value>
</data>
<data name="swDeleteFolder.SuperTooltip" xml:space="preserve">
<value>This allows the user to check referenced objects links in procedure step data for multiple working drafts in a batch mode.
Bad referenced bject links will be identified with an Bad RO Link annotation. Use the PROMS Search tool to list all of the steps that have this annotation.
Be sure a current backup of the database exists prior performing this function.
It is recommended that this be done during off hours.
</value>
</data>
<data name="labelX13.SuperTooltip" xml:space="preserve">
<value>This allows the user to check referenced objects links in procedure step data for multiple working drafts in a batch mode.
Bad referenced bject links will be identified with an Bad RO Link annotation. Use the PROMS Search tool to list all of the steps that have this annotation.
Be sure a current backup of the database exists prior performing this function.
It is recommended that this be done during off hours.
</value>
</data>
<data name="swDeleteAnnotations.SuperTooltip" xml:space="preserve">
<value>This function will refresh transitions in all procedures selected below, whether they were selected individually or as a group via a procedure set.
Be sure a current backup of the database exists prior to running this function.
If more than one procedure is selected, it is recommended that this be performed during off hours.</value>
</data>
<data name="labelX14.SuperTooltip" xml:space="preserve">
<value>This function will refresh transitions in all procedures selected below, whether they were selected individually or as a group via a procedure set.
Be sure a current backup of the database exists prior to running this function.
If more than one procedure is selected, it is recommended that this be performed during off hours.</value>
</data> </data>
<data name="swRefreshTblsForSrch.SuperTooltip" xml:space="preserve"> <data name="swRefreshTblsForSrch.SuperTooltip" xml:space="preserve">
<value>When Word attachments are modified and saved, PROMS will create a PDF of the attachment contents and save it in the database. When this is done, all the of the RO references are resolved as well as pagination of the attachment. This speeds up the overall printing of the procedure in that PROMS simply inserts the attachment contents. <value>When Word attachments are modified and saved, PROMS will create a PDF of the attachment contents and save it in the database. When this is done, all the of the RO references are resolved as well as pagination of the attachment. This speeds up the overall printing of the procedure in that PROMS simply inserts the attachment contents.
@@ -368,6 +403,6 @@ Should an item become orphaned (disconnected) from the rest of the data, it will
</value> </value>
</data> </data>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>38</value> <value>193</value>
</metadata> </metadata>
</root> </root>

View File

@@ -91,15 +91,13 @@ namespace VEPROMS
get { return _DidAll; } get { return _DidAll; }
set { _DidAll = value; } set { _DidAll = value; }
} }
// C2024-003 parameter contains parent section itemid, child section itemid, issubsection flag. private int _prtSectID = -1;
// C2024-003 values needed to print section. public int PrtSectID
private int[] _prtSectID = new int[] { -1, -1, 0 };
public int[] PrtSectID
{ {
get { return _prtSectID; } get { return _prtSectID; }
set { _prtSectID = value; } set { _prtSectID = value; }
} }
public frmPDFStatusForm(ItemInfo myItem, string rev, string watermark, bool debugOutput, bool origPgBrk, bool openPDF, bool overWrite, string pdfPath, ChangeBarDefinition cbd, string pdfFile, Point newLocation, bool insertBlankPages, bool allOrAuto, string prefix, bool saveLinks, int removeTrailingHardReturnsAndManualPageBreaks, bool showPROMSVer, bool didAll, string blankPageText, MergedPdf mergedPdf, string watermarkColor, int[] PrtSectID = null) public frmPDFStatusForm(ItemInfo myItem, string rev, string watermark, bool debugOutput, bool origPgBrk, bool openPDF, bool overWrite, string pdfPath, ChangeBarDefinition cbd, string pdfFile, Point newLocation, bool insertBlankPages, bool allOrAuto, string prefix, bool saveLinks, int removeTrailingHardReturnsAndManualPageBreaks, bool showPROMSVer, bool didAll, string blankPageText, MergedPdf mergedPdf, string watermarkColor, int PrtSectID = -1)
{ {
// B2021-088 moved this if/else from CreatePDF() so that the Approval logic will have access to this logic // B2021-088 moved this if/else from CreatePDF() so that the Approval logic will have access to this logic
ProcedureInfo MyProcedure = myItem as ProcedureInfo; ProcedureInfo MyProcedure = myItem as ProcedureInfo;
@@ -109,7 +107,7 @@ namespace VEPROMS
if (MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave > 0 || MyProcedure.ActiveFormat.PlantFormat.FormatData.TransData.UseTransitionModifier || MyProcedure.ActiveFormat.PlantFormat.FormatData.TransData.UseSpecificTransitionModifier) if (MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave > 0 || MyProcedure.ActiveFormat.PlantFormat.FormatData.TransData.UseTransitionModifier || MyProcedure.ActiveFormat.PlantFormat.FormatData.TransData.UseSpecificTransitionModifier)
{ {
// B2023-035 Pass in the select child (selectedSlave) which may be different than docversionconfig's SelectedSlave // B2023-035 Pass in the select child (selectedSlave) which may be different than docversionconfig's SelectedSlave
MyProcedure = ProcedureInfo.GetItemAndChildrenByUnit(MyProcedure.ItemID, 0, MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave, allOrAuto, MyProcedure.SelectedChildToPrint); MyProcedure = ProcedureInfo.GetItemAndChildrenByUnit(MyProcedure.ItemID, 0, MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave, allOrAuto, MyProcedure.SelectedChildToPrint);
} }
else else
MyProcedure = ProcedureInfo.GetItemAndChildren(MyProcedure.ItemID, allOrAuto); MyProcedure = ProcedureInfo.GetItemAndChildren(MyProcedure.ItemID, allOrAuto);
@@ -131,11 +129,11 @@ namespace VEPROMS
// if the version number of PROMS is 1.0, then we are running a Demo version. // if the version number of PROMS is 1.0, then we are running a Demo version.
// When running a Demo version, force a "Sample" watermark when printing. // When running a Demo version, force a "Sample" watermark when printing.
// B2020-022 append a ".pdf" extension if the file name does on have one. // B2020-022 append a ".pdf" extension if the file name does on have one.
MyPromsPrinter = new PromsPrinter(myItem, rev, (VlnSettings.ReleaseMode.Equals("DEMO")) ? "Sample" : watermark, debugOutput, origPgBrk, pdfPath + @"\Compare", false, overWrite, cbd, (pdfFile.ToUpper().EndsWith(".PDF")) ? pdfFile : pdfFile + ".pdf", insertBlankPages, allOrAuto, Prefix, saveLinks, removeTrailingHardReturnsAndManualPageBreaks, blankPageText, DidAll, mergedPdf, watermarkColor); MyPromsPrinter = new PromsPrinter(myItem, rev, (VlnSettings.ReleaseMode.Equals("DEMO")) ? "Sample" : watermark, debugOutput, origPgBrk, pdfPath + @"\Compare", false, overWrite, cbd, (pdfFile.ToUpper().EndsWith(".PDF"))?pdfFile:pdfFile+".pdf", insertBlankPages, allOrAuto,Prefix,saveLinks,removeTrailingHardReturnsAndManualPageBreaks, blankPageText, DidAll, mergedPdf, watermarkColor);
MyPromsPrinter.PromsVersion = (showPROMSVer) ? AboutVEPROMS.PROMSVersion : ""; //C2018-009 print PROMS version MyPromsPrinter.PromsVersion = (showPROMSVer) ? AboutVEPROMS.PROMSVersion : ""; //C2018-009 print PROMS version
PDFPath = pdfPath; PDFPath = pdfPath;
this.Text = "Creating PDF of " + myItem.DisplayNumber; this.Text = "Creating PDF of " + myItem.DisplayNumber;
_NewLocation = newLocation; _NewLocation = newLocation;
@@ -298,8 +296,8 @@ namespace VEPROMS
} }
while (!MyPromsPrinter.MergeNotIncluded && _PdfFile == null && MessageBox.Show("Try Again?", "PDF Creation Failed", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes); while (!MyPromsPrinter.MergeNotIncluded && _PdfFile == null && MessageBox.Show("Try Again?", "PDF Creation Failed", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes);
if (_PdfFile == null) if (_PdfFile == null)
{ {
this.Close(); this.Close();
@@ -320,7 +318,7 @@ namespace VEPROMS
DateTime tEnd = DateTime.Now; DateTime tEnd = DateTime.Now;
MyStatus = _PdfFile + " created."; MyStatus = _PdfFile + " created.";
MyStatus = string.Format("{0} created in {1:0.} milliseconds", _PdfFile, (TimeSpan.FromTicks(tEnd.Ticks - tStart.Ticks).TotalMilliseconds)); MyStatus = string.Format("{0} created in {1:0.} milliseconds", _PdfFile, (TimeSpan.FromTicks(tEnd.Ticks - tStart.Ticks).TotalMilliseconds));
if (OpenPDF) if (OpenPDF)
{ {
OpenPDFandPlacekeeper(_PdfFile); OpenPDFandPlacekeeper(_PdfFile);
@@ -334,8 +332,8 @@ namespace VEPROMS
if (UserInfo.CanEdit(frmVEPROMS.SMyUserInfo, MyPromsPrinter.MyItem.MyDocVersion)) if (UserInfo.CanEdit(frmVEPROMS.SMyUserInfo, MyPromsPrinter.MyItem.MyDocVersion))
{ {
// C2023-018: Clarify message on temporary/permanent removal of returns/spaces & page breaks // C2023-018: Clarify message on temporary/permanent removal of returns/spaces & page breaks
if (FlexibleMessageBox.Show(this, "The procedure PDF file was created by temporarily removing certain hard returns,\r\ntrailing spaces, and/or manual page breaks that could affect the pagination\r\n" + if (FlexibleMessageBox.Show(this, "The procedure PDF file was created by temporarily removing certain hard returns,\r\ntrailing spaces, and/or manual page breaks that could affect the pagination\r\n"+
"of the procedure.\r\n\r\nAfter reviewing the PDF file, do you want to permanently remove the deleted hard returns, \r\nspaces and/or manual page breaks?\r\n\r\n" + "of the procedure.\r\n\r\nAfter reviewing the PDF file, do you want to permanently remove the deleted hard returns, \r\nspaces and/or manual page breaks?\r\n\r\n"+
"An annotation will be added to every location where data has been deleted. The locations \r\ncan be found by performing a Global Search for the \"Manual Pagination Issues\" annotation type.", "An annotation will be added to every location where data has been deleted. The locations \r\ncan be found by performing a Global Search for the \"Manual Pagination Issues\" annotation type.",
"Confirm Pagination Changes", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) "Confirm Pagination Changes", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
{ {
@@ -347,7 +345,7 @@ namespace VEPROMS
} }
btnOpenFolder.Visible = btnOpenPDF.Visible = true; btnOpenFolder.Visible = btnOpenPDF.Visible = true;
if (CloseWhenDone) if (CloseWhenDone)
{ {
OpenPDFandPlacekeeper(null); OpenPDFandPlacekeeper(null);
@@ -424,7 +422,7 @@ namespace VEPROMS
} }
catch (Exception ex) catch (Exception ex)
{ {
string str = string.Format("{0} - {1} - {2}", pdffile, ex.GetType().Name, ex.Message); string str = string.Format("{0} - {1} - {2}",pdffile,ex.GetType().Name,ex.Message);
MessageBox.Show(str, "Error Opening PDFFile", MessageBoxButtons.OK, MessageBoxIcon.Exclamation); MessageBox.Show(str, "Error Opening PDFFile", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
} }
} }

View File

@@ -45,7 +45,6 @@ namespace VEPROMS
this.itemContainer3 = new DevComponents.DotNetBar.ItemContainer(); this.itemContainer3 = new DevComponents.DotNetBar.ItemContainer();
this.btnNew = new DevComponents.DotNetBar.ButtonItem(); this.btnNew = new DevComponents.DotNetBar.ButtonItem();
this.btnOpen = new DevComponents.DotNetBar.ButtonItem(); this.btnOpen = new DevComponents.DotNetBar.ButtonItem();
this.btnPrint = new DevComponents.DotNetBar.ButtonItem();
this.btnPrepare = new DevComponents.DotNetBar.ButtonItem(); this.btnPrepare = new DevComponents.DotNetBar.ButtonItem();
this.btnAdmin = new DevComponents.DotNetBar.ButtonItem(); this.btnAdmin = new DevComponents.DotNetBar.ButtonItem();
this.btnUpdateFormats = new DevComponents.DotNetBar.ButtonItem(); this.btnUpdateFormats = new DevComponents.DotNetBar.ButtonItem();
@@ -68,6 +67,7 @@ namespace VEPROMS
this.cbScrunch = new System.Windows.Forms.CheckBox(); this.cbScrunch = new System.Windows.Forms.CheckBox();
this.btnNext = new System.Windows.Forms.Button(); this.btnNext = new System.Windows.Forms.Button();
this.cmbFont = new System.Windows.Forms.ComboBox(); this.cmbFont = new System.Windows.Forms.ComboBox();
this.lblDummy = new System.Windows.Forms.Label();
this.labelItem10 = new DevComponents.DotNetBar.LabelItem(); this.labelItem10 = new DevComponents.DotNetBar.LabelItem();
this.bottomProgBar = new DevComponents.DotNetBar.ProgressBarItem(); this.bottomProgBar = new DevComponents.DotNetBar.ProgressBarItem();
this.labelItem9 = new DevComponents.DotNetBar.LabelItem(); this.labelItem9 = new DevComponents.DotNetBar.LabelItem();
@@ -338,7 +338,6 @@ namespace VEPROMS
this.itemContainer3.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.itemContainer3.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
this.btnNew, this.btnNew,
this.btnOpen, this.btnOpen,
this.btnPrint,
this.btnPrepare, this.btnPrepare,
this.btnAdmin}); this.btnAdmin});
// //
@@ -364,16 +363,7 @@ namespace VEPROMS
this.btnOpen.SubItemsExpandWidth = 24; this.btnOpen.SubItemsExpandWidth = 24;
this.btnOpen.Text = "&Open..."; this.btnOpen.Text = "&Open...";
this.btnOpen.Click += new System.EventHandler(this.btnOpen_Click); this.btnOpen.Click += new System.EventHandler(this.btnOpen_Click);
//
// btnPrint
//
this.btnPrint.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
this.btnPrint.Enabled = false;
this.btnPrint.Image = ((System.Drawing.Image)(resources.GetObject("btnPrint.Image")));
this.btnPrint.Name = "btnPrint";
this.btnPrint.SubItemsExpandWidth = 24;
this.btnPrint.Text = "Create &PDF";
this.btnPrint.Click += new System.EventHandler(this.btnPrint_Click);
// //
// btnPrepare // btnPrepare
// //
@@ -514,6 +504,7 @@ namespace VEPROMS
this.bottomBar.Controls.Add(this.cbScrunch); this.bottomBar.Controls.Add(this.cbScrunch);
this.bottomBar.Controls.Add(this.btnNext); this.bottomBar.Controls.Add(this.btnNext);
this.bottomBar.Controls.Add(this.cmbFont); this.bottomBar.Controls.Add(this.cmbFont);
this.bottomBar.Controls.Add(this.lblDummy);
this.bottomBar.Dock = System.Windows.Forms.DockStyle.Bottom; this.bottomBar.Dock = System.Windows.Forms.DockStyle.Bottom;
this.bottomBar.Font = new System.Drawing.Font("Segoe UI", 9F); this.bottomBar.Font = new System.Drawing.Font("Segoe UI", 9F);
this.bottomBar.IsMaximized = false; this.bottomBar.IsMaximized = false;
@@ -601,6 +592,15 @@ namespace VEPROMS
this.cmbFont.TabIndex = 0; this.cmbFont.TabIndex = 0;
this.cmbFont.SelectedIndexChanged += new System.EventHandler(this.cmbFont_SelectedIndexChanged); this.cmbFont.SelectedIndexChanged += new System.EventHandler(this.cmbFont_SelectedIndexChanged);
// //
// lblDummy
//
this.lblDummy.Dock = System.Windows.Forms.DockStyle.Right;
this.lblDummy.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
this.lblDummy.Location = new System.Drawing.Point(1013, 0);
this.lblDummy.Name = "lblDummy";
this.lblDummy.Size = new System.Drawing.Size(10, 25);
this.lblDummy.Visible = false;
//
// labelItem10 // labelItem10
// //
this.labelItem10.BorderSide = DevComponents.DotNetBar.eBorderSide.Left; this.labelItem10.BorderSide = DevComponents.DotNetBar.eBorderSide.Left;
@@ -1635,7 +1635,6 @@ namespace VEPROMS
private DevComponents.DotNetBar.ButtonItem btnNew; private DevComponents.DotNetBar.ButtonItem btnNew;
private DevComponents.DotNetBar.ButtonItem btnOpen; private DevComponents.DotNetBar.ButtonItem btnOpen;
private DevComponents.DotNetBar.ButtonItem btnPrepare; private DevComponents.DotNetBar.ButtonItem btnPrepare;
private DevComponents.DotNetBar.ButtonItem btnPrint;
private DevComponents.DotNetBar.ItemContainer icRecentDocs; private DevComponents.DotNetBar.ItemContainer icRecentDocs;
private DevComponents.DotNetBar.LabelItem labelItem8; private DevComponents.DotNetBar.LabelItem labelItem8;
private DevComponents.DotNetBar.ItemContainer itemContainer5; private DevComponents.DotNetBar.ItemContainer itemContainer5;
@@ -1732,6 +1731,7 @@ namespace VEPROMS
private DevComponents.DotNetBar.ButtonItem btnShortCuts; private DevComponents.DotNetBar.ButtonItem btnShortCuts;
private DevComponents.DotNetBar.LabelItem lblItemID; private DevComponents.DotNetBar.LabelItem lblItemID;
private System.Windows.Forms.ComboBox cmbFont; private System.Windows.Forms.ComboBox cmbFont;
private System.Windows.Forms.Label lblDummy;
private DevComponents.DotNetBar.LabelItem lblResolution; private DevComponents.DotNetBar.LabelItem lblResolution;
private DevComponents.DotNetBar.LabelItem lblUser; private DevComponents.DotNetBar.LabelItem lblUser;
private DevComponents.DotNetBar.LabelItem lblLastChange; private DevComponents.DotNetBar.LabelItem lblLastChange;

View File

@@ -116,7 +116,7 @@ namespace VEPROMS
//added by jcb 20130718 to support create pdf button when multi-unit and user selects a unit //added by jcb 20130718 to support create pdf button when multi-unit and user selects a unit
pi.MyDocVersion.DocVersionConfig.SelectedSlave = pi.ProcedureConfig.SelectedSlave; pi.MyDocVersion.DocVersionConfig.SelectedSlave = pi.ProcedureConfig.SelectedSlave;
DlgPrintProcedure prnDlg = new DlgPrintProcedure(pi); DlgPrintProcedure prnDlg = new DlgPrintProcedure(pi);
//added by jcb 20130718 to support create pdf button when multi-unit and user selects a unit //added by jcb 20130718 to support create pdf button when multi-unit and user selects a unit
@@ -356,12 +356,12 @@ namespace VEPROMS
cmbFont.SelectedIndex = -1; cmbFont.SelectedIndex = -1;
string[] parameters = System.Environment.CommandLine.Split(" ".ToCharArray()); string[] parameters = System.Environment.CommandLine.Split(" ".ToCharArray());
string db = Volian.Base.Library.VlnSettings.GetDB(); string db = Volian.Base.Library.VlnSettings.GetDB();
if (db != null) if (db != null)
Database.SelectedDatabase = db; Database.SelectedDatabase = db;
//B2018-129 Most Recently Used list was being cleared. Needed to remove a (string) type case in the IF statement //B2018-129 Most Recently Used list was being cleared. Needed to remove a (string) type case in the IF statement
if (!string.IsNullOrEmpty((string)Properties.Settings.Default["DefaultDB"])) if (!string.IsNullOrEmpty((string)Properties.Settings.Default["DefaultDB"]))
Database.LastDatabase = Properties.Settings.Default.DefaultDB; Database.LastDatabase = Properties.Settings.Default.DefaultDB;
// Setup the Context menu for DisplaySearch including the symbols // Setup the Context menu for DisplaySearch including the symbols
@@ -400,7 +400,7 @@ namespace VEPROMS
// B2019-107 Error Log message for inconsistent PromsFixes // B2019-107 Error Log message for inconsistent PromsFixes
_MyLog.InfoFormat("\r\nSession Beginning\r\n<===={0}[SQL:{1:yyMM.ddHH}]====== User: {2}/{3} Started {4} ===============>{5}" _MyLog.InfoFormat("\r\nSession Beginning\r\n<===={0}[SQL:{1:yyMM.ddHH}]====== User: {2}/{3} Started {4} ===============>{5}"
, Application.ProductVersion, Database.RevDate, Environment.UserDomainName, Environment.UserName, DateTime.Now.ToString("dddd MMMM d, yyyy h:mm:ss tt"), FormatInfo.Failed ?? ""); , Application.ProductVersion, Database.RevDate, Environment.UserDomainName, Environment.UserName, DateTime.Now.ToString("dddd MMMM d, yyyy h:mm:ss tt"), FormatInfo.Failed ?? "");
// C2022-030 Notify the user if the stored procedure in the database are not update to date // C2022-030 Notify the user if the stored procedure in the database are not update to date
// with those in the PROMSFixes.sql delivered with the PROMS executable // with those in the PROMSFixes.sql delivered with the PROMS executable
string pfVersion = ExeInfo.GetAssocicatedPROMSFixesVersion(); string pfVersion = ExeInfo.GetAssocicatedPROMSFixesVersion();
@@ -418,8 +418,8 @@ namespace VEPROMS
sbMsg.Append("\n\nPlease have your DBA update the database with the PROMSFixes.sql script file that was\ndelivered with this PROMS executable."); sbMsg.Append("\n\nPlease have your DBA update the database with the PROMSFixes.sql script file that was\ndelivered with this PROMS executable.");
sbMsg.Append("\n\nThe PROMSFixes.sql file is included with the PROMS installation download."); sbMsg.Append("\n\nThe PROMSFixes.sql file is included with the PROMS installation download.");
sbMsg.Append("\n\nIt can also be found in your PROMS executable folder:"); sbMsg.Append("\n\nIt can also be found in your PROMS executable folder:");
sbMsg.AppendFormat("\n\t{0}", ExeInfo.PROMSExecutableFolderPath()); sbMsg.AppendFormat("\n\t{0}",ExeInfo.PROMSExecutableFolderPath());
FlexibleMessageBox.Show(sbMsg.ToString(), "SQL Stored Procedures Version Difference"); FlexibleMessageBox.Show(sbMsg.ToString(),"SQL Stored Procedures Version Difference");
} }
foreach (string parameter in parameters) foreach (string parameter in parameters)
@@ -527,7 +527,7 @@ namespace VEPROMS
tv.ViewPDF += new vlnTreeViewPdfEvent(tv_ViewPDF); tv.ViewPDF += new vlnTreeViewPdfEvent(tv_ViewPDF);
displayApplicability.ApplicabilityViewModeChanged += new DisplayApplicability.DisplayApplicabilityEvent(displayApplicability_ApplicabilityViewModeChanged); displayApplicability.ApplicabilityViewModeChanged += new DisplayApplicability.DisplayApplicabilityEvent(displayApplicability_ApplicabilityViewModeChanged);
tv.ExportImportProcedureSets += new vlnTreeViewEvent(tv_ExportImportProcedureSets); tv.ExportImportProcedureSets += new vlnTreeViewEvent(tv_ExportImportProcedureSets);
tv.PrintTransitionReport += new vlnTreeViewEvent(tv_PrintTransitionReport); tv.PrintTransitionReport += new vlnTreeViewEvent(tv_PrintTransitionReport);
tv.ProcessingComplete += tv_ProcessingComplete; tv.ProcessingComplete += tv_ProcessingComplete;
@@ -690,7 +690,7 @@ namespace VEPROMS
else else
{ {
int ownerid = MySessionInfo.CheckOutItem(fi.FolderID, CheckOutType.Session); int ownerid = MySessionInfo.CheckOutItem(fi.FolderID, CheckOutType.Session);
dlgExportImport dlg = new dlgExportImport(args.Index == 0 ? "Export" : "Import", fi, this, (E_UCFImportOptions)Properties.Settings.Default.UCFImportOpt);//Added frmVEPROMS Parameter dlgExportImport dlg = new dlgExportImport(args.Index == 0 ? "Export" : "Import", fi, this, (E_UCFImportOptions)Properties.Settings.Default.UCFImportOpt);//Added frmVEPROMS Parameter
dlg.ShowDialog(this); dlg.ShowDialog(this);
@@ -1139,7 +1139,7 @@ namespace VEPROMS
dvi.DocVersionConfig.SelectedSlave = 0; dvi.DocVersionConfig.SelectedSlave = 0;
} }
void tv_PrintProcedure(object sender, vlnTreeEventArgs args) void tv_PrintProcedure(object sender, vlnTreeEventArgs args)
{ {
ProcedureInfo pi = (args.Node as VETreeNode).VEObject as ProcedureInfo; ProcedureInfo pi = (args.Node as VETreeNode).VEObject as ProcedureInfo;
@@ -1178,8 +1178,8 @@ namespace VEPROMS
pi.MyDocVersion.DocVersionConfig.SelectedSlave = 0; pi.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
} }
} }
catch (Exception ex) catch(Exception ex)
{ {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
sb.AppendLine("Could not create PDF Print"); sb.AppendLine("Could not create PDF Print");
@@ -1197,21 +1197,7 @@ namespace VEPROMS
{ {
//args.Node.Parent. //args.Node.Parent.
SectionInfo si2 = (args.Node as VETreeNode).VEObject as SectionInfo; SectionInfo si2 = (args.Node as VETreeNode).VEObject as SectionInfo;
int[] _prtSectID = new int[3]; // C2024-003 parameter contains parent section itemid, child section itemid, issubsection flag. int _prtSectID = si2.ItemID;
if (si2.IsSubsection == true)
{
// If section is a subsection. Assigned values are section and subsection.
_prtSectID[0] = si2.MyParent.ItemID; // section
_prtSectID[1] = si2.ItemID; // sub section
_prtSectID[2] = Convert.ToInt32(si2.IsSubsection); // IsSubSection flag
}
else
{
// If section is a regular section. assign values is section is not a subsection.
_prtSectID[0] = si2.ItemID; // section
_prtSectID[1] = -1; // sub section
_prtSectID[2] = Convert.ToInt32(si2.IsSubsection); // IsSubSection flag
}
if (si2 == null) return; if (si2 == null) return;
@@ -1221,7 +1207,7 @@ namespace VEPROMS
using (DlgPrintProcedure prnDlg = new DlgPrintProcedure(si2.MyProcedure)) using (DlgPrintProcedure prnDlg = new DlgPrintProcedure(si2.MyProcedure))
{ {
prnDlg.PrtSectID = _prtSectID; // Assign Section print values to parameter used in print secetions / sub sections. prnDlg.PrtSectID = _prtSectID;
prnDlg.SelectedSlave = args.UnitIndex; prnDlg.SelectedSlave = args.UnitIndex;
prnDlg.MySessionInfo = MySessionInfo; prnDlg.MySessionInfo = MySessionInfo;
prnDlg.SetupForProcedure(); // Setup filename prnDlg.SetupForProcedure(); // Setup filename
@@ -1655,11 +1641,11 @@ namespace VEPROMS
if (!_WeAreExitingPROMS && !ClosingWithError && tc.SelectedDisplayTabItem != null && tc._MyDisplayTabItems.Count > 0) if (!_WeAreExitingPROMS && !ClosingWithError && tc.SelectedDisplayTabItem != null && tc._MyDisplayTabItems.Count > 0)
{ {
// B2019-071 dialog to ask user if we are to close one tab or exit // B2019-071 dialog to ask user if we are to close one tab or exit
DlgCloseTabsOrExit dctoe = new DlgCloseTabsOrExit(MyParent == null, PROMSWindowForms.Count > 0); DlgCloseTabsOrExit dctoe = new DlgCloseTabsOrExit(MyParent == null, PROMSWindowForms.Count > 0);
dctoe.ShowDialog(); dctoe.ShowDialog();
// B2019-101 flag that we are exiting from PROMS main window (separate windows) // B2019-101 flag that we are exiting from PROMS main window (separate windows)
_WeAreExitingPROMS = (MyParent == null && dctoe.ExitPROMS); _WeAreExitingPROMS = (MyParent == null && dctoe.ExitPROMS);
if (dctoe.Cancel) // B2019-071 user decided to not close any tab and not exit PROMS - so do nothing and continue working if (dctoe.Cancel) // B2019-071 user decided to not close any tab and not exit PROMS - so do nothing and continue working
{ {
@@ -1681,7 +1667,7 @@ namespace VEPROMS
tc.CloseTabItem(tc.SelectedDisplayTabItem); tc.CloseTabItem(tc.SelectedDisplayTabItem);
// B2019-071 close just the current tab and continue working // B2019-071 close just the current tab and continue working
if (!dctoe.ExitPROMS) if (!dctoe.ExitPROMS)
{ {
n = 0; n = 0;
e.Cancel = true; e.Cancel = true;
@@ -1714,7 +1700,7 @@ namespace VEPROMS
} }
// This keeps PROMS from Hanging under certain circumstances // This keeps PROMS from Hanging under certain circumstances
tc.ShuttingDown = true; tc.ShuttingDown = true;
// B2019-161 When shutting down output the timing information (to the error log) // B2019-161 When shutting down output the timing information (to the error log)
if (VolianTimer.TimingsOn) if (VolianTimer.TimingsOn)
@@ -1896,12 +1882,12 @@ namespace VEPROMS
private DevComponents.DotNetBar.ButtonItem btnUserControlOfFormatsExport; private DevComponents.DotNetBar.ButtonItem btnUserControlOfFormatsExport;
private DevComponents.DotNetBar.ButtonItem btnUserControlOfFormatsImport; private DevComponents.DotNetBar.ButtonItem btnUserControlOfFormatsImport;
private TabItemsToClose _MyCloseTabList = new TabItemsToClose(); private TabItemsToClose _MyCloseTabList = new TabItemsToClose();
public TabItemsToClose MyCloseTabList public TabItemsToClose MyCloseTabList
{ {
get { return _MyCloseTabList; } get { return _MyCloseTabList; }
} }
private bool _DisablePing = false; private bool _DisablePing = false;
public bool DisablePing public bool DisablePing
{ {
@@ -2011,7 +1997,7 @@ namespace VEPROMS
if (ContentInfo.IsInCache(id)) if (ContentInfo.IsInCache(id))
{ {
ContentInfo ci = ContentInfo.Get(id); ContentInfo ci = ContentInfo.Get(id);
if (MySessionInfo.LastContentChange >= ci.LastChangedInt64) if (MySessionInfo.LastContentChange >= ci.LastChangedInt64)
{ {
using (Content c = Content.Get(id)) using (Content c = Content.Get(id))
@@ -2035,7 +2021,7 @@ namespace VEPROMS
} }
} }
catch { } catch { }
//MySemaphore.Release(); //MySemaphore.Release();
//_MyLog.DebugFormat("{0},{1:X},{2:X},{3:X}", DateTime.Now.ToLongTimeString(), lastChanged, MySessionInfo.LastContentChange, MySessionInfo.LastChangedInt64); //_MyLog.DebugFormat("{0},{1:X},{2:X},{3:X}", DateTime.Now.ToLongTimeString(), lastChanged, MySessionInfo.LastContentChange, MySessionInfo.LastChangedInt64);
} }
@@ -2106,13 +2092,12 @@ namespace VEPROMS
btnResetSecurity = new ButtonItem("btnResetSecurity", "Reset Security"); btnResetSecurity = new ButtonItem("btnResetSecurity", "Reset Security");
btnSecurity.SubItems.Add(btnResetSecurity); btnSecurity.SubItems.Add(btnResetSecurity);
btnResetSecurity.Click += new EventHandler(btnResetSecurity_Click); btnResetSecurity.Click += new EventHandler(btnResetSecurity_Click);
//batch refresh transitions //batch refresh transitions
btnAdministrativeTools = new ButtonItem("btnAdministrativeTools", "Administrative Tools"); btnAdministrativeTools = new ButtonItem("btnAdministrativeTools", "Administrative Tools");
btnAdministrativeTools.Click += new EventHandler(btnAdministrativeTools_Click); btnAdministrativeTools.Click += new EventHandler(btnAdministrativeTools_Click);
btnAdmin.SubItems.Add(btnAdministrativeTools); btnAdmin.SubItems.Add(btnAdministrativeTools);
this.superTooltip1.SetSuperTooltip(btnPrint, new SuperTooltipInfo("Create PDF", null, null, null, null, eTooltipColor.Gray));
this.superTooltip1.SetSuperTooltip(btnExit, new SuperTooltipInfo("Exit", null, null, null, null, eTooltipColor.Gray)); this.superTooltip1.SetSuperTooltip(btnExit, new SuperTooltipInfo("Exit", null, null, null, null, eTooltipColor.Gray));
this.superTooltip1.SetSuperTooltip(btnOptions, new SuperTooltipInfo("Options", null, null, null, null, eTooltipColor.Gray)); this.superTooltip1.SetSuperTooltip(btnOptions, new SuperTooltipInfo("Options", null, null, null, null, eTooltipColor.Gray));
this.superTooltip1.SetSuperTooltip(btnManageSecurity, new SuperTooltipInfo("Manage Security", null, null, null, null, eTooltipColor.Gray)); this.superTooltip1.SetSuperTooltip(btnManageSecurity, new SuperTooltipInfo("Manage Security", null, null, null, null, eTooltipColor.Gray));
@@ -2120,7 +2105,7 @@ namespace VEPROMS
this.superTooltip1.SetSuperTooltip(btnResetSecurity, new SuperTooltipInfo("Reset Security", null, null, null, null, eTooltipColor.Gray)); this.superTooltip1.SetSuperTooltip(btnResetSecurity, new SuperTooltipInfo("Reset Security", null, null, null, null, eTooltipColor.Gray));
this.superTooltip1.SetSuperTooltip(btnAdministrativeTools, new SuperTooltipInfo("Administrative Tools", null, null, null, null, eTooltipColor.Gray)); this.superTooltip1.SetSuperTooltip(btnAdministrativeTools, new SuperTooltipInfo("Administrative Tools", null, null, null, null, eTooltipColor.Gray));
this.superTooltip1.SetSuperTooltip(btnUpdateFormats, new SuperTooltipInfo("Update Formats", null, null, null, null, eTooltipColor.Gray)); this.superTooltip1.SetSuperTooltip(btnUpdateFormats, new SuperTooltipInfo("Update Formats", null, null, null, null, eTooltipColor.Gray));
try try
{ {
MyUserInfo = UserInfo.GetByUserID(VlnSettings.UserID); MyUserInfo = UserInfo.GetByUserID(VlnSettings.UserID);
@@ -2167,7 +2152,7 @@ namespace VEPROMS
btnFormats.Visible = isVisible; btnFormats.Visible = isVisible;
btnSecurity.Visible = isVisible; btnSecurity.Visible = isVisible;
btnAdmin.Enabled = (isVisible || HasSetAdministrator(MyUserInfo)); btnAdmin.Enabled = (isVisible || HasSetAdministrator(MyUserInfo));
tmrCloseTabItems = new Timer(); tmrCloseTabItems = new Timer();
tmrCloseTabItems.Interval = 100; tmrCloseTabItems.Interval = 100;
tmrCloseTabItems.Tick += new EventHandler(tmrCloseTabItems_Tick); tmrCloseTabItems.Tick += new EventHandler(tmrCloseTabItems_Tick);
@@ -2175,7 +2160,7 @@ namespace VEPROMS
CloseSessionsNoLongerActive(); CloseSessionsNoLongerActive();
MySessionInfo = SessionInfo.BeginSession(Environment.MachineName, System.Diagnostics.Process.GetCurrentProcess().Id); MySessionInfo = SessionInfo.BeginSession(Environment.MachineName, System.Diagnostics.Process.GetCurrentProcess().Id);
if (MySessionInfo == null) if (MySessionInfo == null)
{ {
MessageBox.Show("This database is locked by the Administrator. Please try again later", "PROMS is Locked"); MessageBox.Show("This database is locked by the Administrator. Please try again later", "PROMS is Locked");
@@ -2219,7 +2204,7 @@ namespace VEPROMS
if (Settings.Default["Size"] != null) this.Size = Settings.Default.Size; if (Settings.Default["Size"] != null) this.Size = Settings.Default.Size;
//if (Settings.Default["WindowState"] != null) this.WindowState = Settings.Default.WindowState; //if (Settings.Default["WindowState"] != null) this.WindowState = Settings.Default.WindowState;
//if (Settings.Default.SaveTreeviewExpanded) epProcedures.Expanded = Settings.Default.TreeviewExpanded; //if (Settings.Default.SaveTreeviewExpanded) epProcedures.Expanded = Settings.Default.TreeviewExpanded;
// if the Procedures panel was left open from the last session, then open it // if the Procedures panel was left open from the last session, then open it
epProcedures.Expanded = Settings.Default.TreeviewExpanded; epProcedures.Expanded = Settings.Default.TreeviewExpanded;
if (Settings.Default["QATItems"] != null) ribbonControl1.QatLayout = Settings.Default.QATItems; if (Settings.Default["QATItems"] != null) ribbonControl1.QatLayout = Settings.Default.QATItems;
@@ -2391,7 +2376,7 @@ namespace VEPROMS
TurnChangeManagerOn.Execute(); TurnChangeManagerOn.Execute();
} }
} }
// C2015-022 Separate Windows. This is a dictionary of child PROMS windows forms (frmVEPROMS) // C2015-022 Separate Windows. This is a dictionary of child PROMS windows forms (frmVEPROMS)
// //
Dictionary<int, frmVEPROMS> _PROMSWindowForms = null; Dictionary<int, frmVEPROMS> _PROMSWindowForms = null;
@@ -2439,7 +2424,7 @@ namespace VEPROMS
while (!(_tn.VEObject is FolderInfo)) while (!(_tn.VEObject is FolderInfo))
{ {
// back up to the first folder tree node // back up to the first folder tree node
_tn = (VETreeNode)_tn.Parent; _tn = (VETreeNode)_tn.Parent;
} }
_tn.Nodes.Clear(); // remove the child nodes from main window - child window now has this part of the procedure tree _tn.Nodes.Clear(); // remove the child nodes from main window - child window now has this part of the procedure tree
@@ -2536,7 +2521,7 @@ namespace VEPROMS
} }
DialogResult dr = System.Windows.Forms.DialogResult.Yes; DialogResult dr = System.Windows.Forms.DialogResult.Yes;
// RHM20150507 Table Scrunch // RHM20150507 Table Scrunch
Rtf2Pdf.AllowTableScrunching = cbScrunch.Checked ? _DefaultScrunchingRules : TableScrunching.None; Rtf2Pdf.AllowTableScrunching = cbScrunch.Checked ? _DefaultScrunchingRules : TableScrunching.None;
@@ -2768,7 +2753,7 @@ namespace VEPROMS
tmrCloseTabItems.Enabled = false; tmrCloseTabItems.Enabled = false;
_TimeActivity1.Open(); _TimeActivity1.Open();
while (MyCloseTabList.CountDTI > 0) while (MyCloseTabList.CountDTI > 0)
{ {
DisplayTabItem dti = MyCloseTabList.PopDTI(); DisplayTabItem dti = MyCloseTabList.PopDTI();
@@ -3140,22 +3125,44 @@ namespace VEPROMS
if (dvi != null) if (dvi != null)
{ {
DlgPrintProcedure prnDlg = new DlgPrintProcedure(dvi, true); DlgPrintProcedure prnDlg = new DlgPrintProcedure(dvi, true);
if (dvi.MultiUnitCount == 0) prnDlg.SelectedSlave = -1; if (dvi.MultiUnitCount == 0)
{
prnDlg.SelectedSlave = -1;
}
else if (dvi.MultiUnitCount > 0)
{
string[] arguments = Environment.GetCommandLineArgs();
for (int i = 0; i < arguments.Length; i++)
{
if (arguments[i].Contains("/C="))
{
Console.WriteLine("In arguments loop");
//int num;
string[] childarg = arguments[i].Split('=');
if (int.TryParse(childarg[1], out int num))
{
prnDlg.SelectedSlave = num;
}
}
}
}
prnDlg.AllowDateTimePrefixSuffix = false; //C2018-033 don't append any selected date/time pdf file prefix or suffix (defined in working draft properties) prnDlg.AllowDateTimePrefixSuffix = false; //C2018-033 don't append any selected date/time pdf file prefix or suffix (defined in working draft properties)
prnDlg.ShowDialog(this); // RHM 20120925 - Center dialog over PROMS window prnDlg.ShowDialog(this); // RHM 20120925 - Center dialog over PROMS window
//prnDlg.FormClosed += new FormClosedEventHandler(prnDlg_FormClosed); //prnDlg.FormClosed += new FormClosedEventHandler(prnDlg_FormClosed);
//while (!_RunNext) Application.DoEvents(); //while (!_RunNext) Application.DoEvents();
}
}
}
}
ranAuto = true; ranAuto = true;
} }
}
}
if (ranAuto) if (ranAuto)
{ {
this.Close(); this.Close();
}
}
} }
} }
@@ -3216,6 +3223,14 @@ namespace VEPROMS
txtSearch.Visible = false; txtSearch.Visible = false;
lblLastChange.Visible = false; lblLastChange.Visible = false;
btnStepRTF.Visible = false; btnStepRTF.Visible = false;
lblDummy.Visible = false;
}
else
{
// C2024-007: On Proms main form, allow for control of whether the FontMenu
// combo box is displayed. Only done when running in debugmode
cmbFont.Visible = Volian.Base.Library.VlnSettings.GetCommandFlag("FontMenu");
lblDummy.Visible = !Volian.Base.Library.VlnSettings.GetCommandFlag("FontMenu");
} }
} }
@@ -3880,7 +3895,7 @@ namespace VEPROMS
{ {
infoPanel.Expanded = true; infoPanel.Expanded = true;
infoTabs.SelectedTab = infotabRO; infoTabs.SelectedTab = infotabRO;
displayRO.ProgressBar = bottomProgBar; displayRO.ProgressBar = bottomProgBar;
displayRO.MyRTB = (SelectedStepTabPanel == null) ? null : displayRO.MyRTB = (SelectedStepTabPanel == null) ? null :
@@ -4039,7 +4054,7 @@ namespace VEPROMS
// need this to update RO Tree after UpdateRofst (B2015-226) // need this to update RO Tree after UpdateRofst (B2015-226)
// B2022-026 RO Memory reduction coding (Jakes Merge) // B2022-026 RO Memory reduction coding (Jakes Merge)
displayRO.MyROFST = SelectedROFst; displayRO.MyROFST = SelectedROFst;
displayRO.LoadTree(); displayRO.LoadTree();
// resetting the MyROFSTLookup for the search & reports panels will refresh the RO trees after UpdateRofst in each of those panels (B2015-226) // resetting the MyROFSTLookup for the search & reports panels will refresh the RO trees after UpdateRofst in each of those panels (B2015-226)
@@ -4082,7 +4097,7 @@ namespace VEPROMS
SetCaption(tv.SelectedNode as VETreeNode); SetCaption(tv.SelectedNode as VETreeNode);
displayApplicability.MyDisplayTabItem = tc.SelectedDisplayTabItem; displayApplicability.MyDisplayTabItem = tc.SelectedDisplayTabItem;
if (tc.SelectedDisplayTabItem.MyItemInfo.MyDocVersion.DocVersionAssociationCount > 0) if (tc.SelectedDisplayTabItem.MyItemInfo.MyDocVersion.DocVersionAssociationCount > 0)
{ {
displayRO.MyROFST = tc.SelectedDisplayTabItem.MyItemInfo.MyDocVersion.DocVersionAssociations[0].MyROFst; displayRO.MyROFST = tc.SelectedDisplayTabItem.MyItemInfo.MyDocVersion.DocVersionAssociations[0].MyROFst;
@@ -4098,10 +4113,6 @@ namespace VEPROMS
lblUser.Text = tc.SelectedDisplayTabItem.MyUserRole; lblUser.Text = tc.SelectedDisplayTabItem.MyUserRole;
if (tc.SelectedDisplayTabItem.MyItemInfo.MyDocVersion.MultiUnitCount > 1)
btnPrint.Visible = false;
else
btnPrint.Visible = true;
// Reset the ribbon buttons B2016-148 (ex. a copystep done in a different procedure tab my require the paste step options to be active // Reset the ribbon buttons B2016-148 (ex. a copystep done in a different procedure tab my require the paste step options to be active
if (tc.SelectedDisplayTabItem != null && tc.SelectedDisplayTabItem.MyStepTabPanel != null) // MyStepTabPanel will be null if the active tab is a Word Attachment if (tc.SelectedDisplayTabItem != null && tc.SelectedDisplayTabItem.MyStepTabPanel != null) // MyStepTabPanel will be null if the active tab is a Word Attachment
@@ -4297,7 +4308,7 @@ namespace VEPROMS
// B2022-026 RO Memory reduction coding (Jakes Merge) // B2022-026 RO Memory reduction coding (Jakes Merge)
displayRO.ProgressBar = bottomProgBar; displayRO.ProgressBar = bottomProgBar;
displayRO.MyRTB = args.MyEditItem.MyStepRTB; displayRO.MyRTB = args.MyEditItem.MyStepRTB;
displayRO.LoadTree(); displayRO.LoadTree();
displayBookMarks.MyEditItem = args.MyEditItem; displayBookMarks.MyEditItem = args.MyEditItem;
displayHistory.MyEditItem = args.MyEditItem; displayHistory.MyEditItem = args.MyEditItem;
@@ -4316,7 +4327,7 @@ namespace VEPROMS
displayRO.ROTypeFilter = SelectedStepTabPanel.MyStepPanel.SelectedEditItem is Volian.Controls.Library.GridItem && (SelectedStepTabPanel.MyStepPanel.SelectedEditItem as Volian.Controls.Library.GridItem).MyFlexGrid.IsRoTable ? displayRO.ROTypeFilter = SelectedStepTabPanel.MyStepPanel.SelectedEditItem is Volian.Controls.Library.GridItem && (SelectedStepTabPanel.MyStepPanel.SelectedEditItem as Volian.Controls.Library.GridItem).MyFlexGrid.IsRoTable ?
E_ROValueType.Table : (SelectedStepTabPanel.MyStepPanel.SelectedEditItem.MyItemInfo.IsFigure) ? E_ROValueType.Image : E_ROValueType.Text; E_ROValueType.Table : (SelectedStepTabPanel.MyStepPanel.SelectedEditItem.MyItemInfo.IsFigure) ? E_ROValueType.Image : E_ROValueType.Text;
if (_LastStepRTB.IsRoTable && _LastStepRTB.MyItemInfo.MyContent.ContentRoUsageCount > 0) if (_LastStepRTB.IsRoTable && _LastStepRTB.MyItemInfo.MyContent.ContentRoUsageCount > 0)
displayRO.CurROLink = _LastStepRTB.MyItemInfo.MyContent.ContentRoUsages[0]; displayRO.CurROLink = _LastStepRTB.MyItemInfo.MyContent.ContentRoUsages[0];
@@ -4356,7 +4367,6 @@ namespace VEPROMS
ctrlAnnotationDetails.UpdateAnnotationGrid(_CurrentItem); // set the CurrentItem (send Message) when the MSWord section is opened. ctrlAnnotationDetails.UpdateAnnotationGrid(_CurrentItem); // set the CurrentItem (send Message) when the MSWord section is opened.
} }
btnPrint.Enabled = (_CurrentItem != null);
} }
void _LastStepRTB_EditModeChanged(object sender, EventArgs args) void _LastStepRTB_EditModeChanged(object sender, EventArgs args)
@@ -4434,7 +4444,7 @@ namespace VEPROMS
displayRO.ROTypeFilter = SelectedStepTabPanel.MyStepPanel.SelectedEditItem is Volian.Controls.Library.GridItem && (SelectedStepTabPanel.MyStepPanel.SelectedEditItem as Volian.Controls.Library.GridItem).MyFlexGrid.IsRoTable ? displayRO.ROTypeFilter = SelectedStepTabPanel.MyStepPanel.SelectedEditItem is Volian.Controls.Library.GridItem && (SelectedStepTabPanel.MyStepPanel.SelectedEditItem as Volian.Controls.Library.GridItem).MyFlexGrid.IsRoTable ?
E_ROValueType.Table : (SelectedStepTabPanel.MyStepPanel.SelectedEditItem.MyItemInfo.IsFigure) ? E_ROValueType.Image : E_ROValueType.Text; E_ROValueType.Table : (SelectedStepTabPanel.MyStepPanel.SelectedEditItem.MyItemInfo.IsFigure) ? E_ROValueType.Image : E_ROValueType.Text;
displayRO.ProgressBar = bottomProgBar; displayRO.ProgressBar = bottomProgBar;
displayRO.MyRTB = SelectedStepTabPanel.MyStepPanel.SelectedEditItem.MyStepRTB; displayRO.MyRTB = SelectedStepTabPanel.MyStepPanel.SelectedEditItem.MyStepRTB;
displayRO.CurROLink = args.MyLinkText.MyRoUsageInfo; displayRO.CurROLink = args.MyLinkText.MyRoUsageInfo;
@@ -4460,7 +4470,7 @@ namespace VEPROMS
if (!tv.Focused && tc.SelectedDisplayTabItem != null && tc.SelectedDisplayTabItem.SelectedItemInfo != null) if (!tv.Focused && tc.SelectedDisplayTabItem != null && tc.SelectedDisplayTabItem.SelectedItemInfo != null)
tv.AdjustTree(tc.SelectedDisplayTabItem.SelectedItemInfo); tv.AdjustTree(tc.SelectedDisplayTabItem.SelectedItemInfo);
VETreeNode vtn = tv.SelectedNode as VETreeNode; VETreeNode vtn = tv.SelectedNode as VETreeNode;
if (vtn == null) return; if (vtn == null) return;
StepInfo stpinf = vtn.VEObject as StepInfo; StepInfo stpinf = vtn.VEObject as StepInfo;
if (stpinf == null || !stpinf.IsRNOPart) //B2017-037 is this a RNO step type element - don't allow insert before/after if (stpinf == null || !stpinf.IsRNOPart) //B2017-037 is this a RNO step type element - don't allow insert before/after
@@ -4848,12 +4858,7 @@ namespace VEPROMS
StepRTB.MyFontFamily = cmbFont.SelectedValue as FontFamily; StepRTB.MyFontFamily = cmbFont.SelectedValue as FontFamily;
} }
private void btnPrint_Click(object sender, EventArgs e)
{
DlgPrintProcedure prnDlg = new DlgPrintProcedure(this._CurrentItem.MyProcedure);
prnDlg.MySessionInfo = MySessionInfo;
prnDlg.ShowDialog(this); // RHM 20120925 - Center dialog over PROMS window
}
private void lblResolution_Click(object sender, EventArgs e) private void lblResolution_Click(object sender, EventArgs e)
{ {
@@ -4898,7 +4903,7 @@ namespace VEPROMS
private void btnUpdateFormat_Click(object sender, EventArgs e) private void btnUpdateFormat_Click(object sender, EventArgs e)
{ {
UpdateFormats(null); UpdateFormats(null);
} }
private void UpdateFormats(string mypath) private void UpdateFormats(string mypath)
@@ -4969,7 +4974,7 @@ namespace VEPROMS
try try
{ {
frmSendErrorLog frm = new frmSendErrorLog(Properties.Settings.Default.OutlookEmail, Properties.Settings.Default["SMTPServer"].ToString(), Properties.Settings.Default["SMTPUser"].ToString(), ErrorLogFileName); frmSendErrorLog frm = new frmSendErrorLog(Properties.Settings.Default.OutlookEmail, Properties.Settings.Default["SMTPServer"].ToString(), Properties.Settings.Default["SMTPUser"].ToString(), ErrorLogFileName);
if (frm.ShowDialog(this) == DialogResult.OK) if (frm.ShowDialog(this) == DialogResult.OK)
{ {
Properties.Settings.Default.OutlookEmail = frm.OutlookEmail; Properties.Settings.Default.OutlookEmail = frm.OutlookEmail;

View File

@@ -30,8 +30,8 @@ namespace VEPROMS
{ {
this.components = new System.ComponentModel.Container(); this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmVersionsProperties)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmVersionsProperties));
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
this.ppBtnCancel = new System.Windows.Forms.Button(); this.ppBtnCancel = new System.Windows.Forms.Button();
this.ppBtnOK = new System.Windows.Forms.Button(); this.ppBtnOK = new System.Windows.Forms.Button();
this.ppBtnDefaultChgBar = new DevComponents.DotNetBar.ButtonX(); this.ppBtnDefaultChgBar = new DevComponents.DotNetBar.ButtonX();
@@ -95,17 +95,14 @@ namespace VEPROMS
this.ppLblDefSettingsInfo = new System.Windows.Forms.Label(); this.ppLblDefSettingsInfo = new System.Windows.Forms.Label();
this.dlgROFolder = new System.Windows.Forms.FolderBrowserDialog(); this.dlgROFolder = new System.Windows.Forms.FolderBrowserDialog();
this.tcVersions = new DevComponents.DotNetBar.TabControl(); this.tcVersions = new DevComponents.DotNetBar.TabControl();
this.tcpGeneral = new DevComponents.DotNetBar.TabControlPanel();
this.tiGeneral = new DevComponents.DotNetBar.TabItem(this.components);
this.tcpRefereceObjects = new DevComponents.DotNetBar.TabControlPanel();
this.ppBtnRoToSql = new System.Windows.Forms.Button();
this.tbRoDb = new System.Windows.Forms.TextBox();
this.ppBtnRoDbBrowse = new System.Windows.Forms.Button();
this.btnRoDbProperties = new DevComponents.DotNetBar.ButtonX();
this.cmbRoDb = new System.Windows.Forms.ComboBox();
this.ppGpbxUpROvals = new DevComponents.DotNetBar.Controls.GroupPanel();
this.tiRefObjs = new DevComponents.DotNetBar.TabItem(this.components);
this.tabControlPanel2 = new DevComponents.DotNetBar.TabControlPanel(); this.tabControlPanel2 = new DevComponents.DotNetBar.TabControlPanel();
this.gpxMOSLandLocation = new DevComponents.DotNetBar.Controls.GroupPanel();
this.ppCmbxMOSLandcornerLoc = new DevComponents.DotNetBar.Controls.ComboBoxEx();
this.tbxMOSLandyloc = new DevComponents.DotNetBar.Controls.TextBoxX();
this.tbxMOSLandxloc = new DevComponents.DotNetBar.Controls.TextBoxX();
this.lblMOSLandcorner = new System.Windows.Forms.Label();
this.lblMOSLandyloc = new System.Windows.Forms.Label();
this.lblMOSLandxloc = new System.Windows.Forms.Label();
this.ppChbxMOSview = new DevComponents.DotNetBar.Controls.CheckBoxX(); this.ppChbxMOSview = new DevComponents.DotNetBar.Controls.CheckBoxX();
this.gpxMOSLocation = new DevComponents.DotNetBar.Controls.GroupPanel(); this.gpxMOSLocation = new DevComponents.DotNetBar.Controls.GroupPanel();
this.ppCmbxMOScornerLoc = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.ppCmbxMOScornerLoc = new DevComponents.DotNetBar.Controls.ComboBoxEx();
@@ -124,6 +121,16 @@ namespace VEPROMS
this.ppCmbxMOSformat = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.ppCmbxMOSformat = new DevComponents.DotNetBar.Controls.ComboBoxEx();
this.lblMOSformat = new System.Windows.Forms.Label(); this.lblMOSformat = new System.Windows.Forms.Label();
this.tiMergedOutputSettings = new DevComponents.DotNetBar.TabItem(this.components); this.tiMergedOutputSettings = new DevComponents.DotNetBar.TabItem(this.components);
this.tcpGeneral = new DevComponents.DotNetBar.TabControlPanel();
this.tiGeneral = new DevComponents.DotNetBar.TabItem(this.components);
this.tcpRefereceObjects = new DevComponents.DotNetBar.TabControlPanel();
this.ppBtnRoToSql = new System.Windows.Forms.Button();
this.tbRoDb = new System.Windows.Forms.TextBox();
this.ppBtnRoDbBrowse = new System.Windows.Forms.Button();
this.btnRoDbProperties = new DevComponents.DotNetBar.ButtonX();
this.cmbRoDb = new System.Windows.Forms.ComboBox();
this.ppGpbxUpROvals = new DevComponents.DotNetBar.Controls.GroupPanel();
this.tiRefObjs = new DevComponents.DotNetBar.TabItem(this.components);
this.tabControlPanel1 = new DevComponents.DotNetBar.TabControlPanel(); this.tabControlPanel1 = new DevComponents.DotNetBar.TabControlPanel();
this.ppChbxEnhancedAllowMods = new System.Windows.Forms.CheckBox(); this.ppChbxEnhancedAllowMods = new System.Windows.Forms.CheckBox();
this.btnUnlinkDocVersion = new System.Windows.Forms.Button(); this.btnUnlinkDocVersion = new System.Windows.Forms.Button();
@@ -210,25 +217,19 @@ namespace VEPROMS
this.ROPrefixBindingSource = new System.Windows.Forms.BindingSource(this.components); this.ROPrefixBindingSource = new System.Windows.Forms.BindingSource(this.components);
this.PDFLocationBrowserDialog = new System.Windows.Forms.FolderBrowserDialog(); this.PDFLocationBrowserDialog = new System.Windows.Forms.FolderBrowserDialog();
this.formatInfoListBindingSource = new System.Windows.Forms.BindingSource(this.components); this.formatInfoListBindingSource = new System.Windows.Forms.BindingSource(this.components);
this.gpxMOSLandLocation = new DevComponents.DotNetBar.Controls.GroupPanel();
this.ppCmbxMOSLandcornerLoc = new DevComponents.DotNetBar.Controls.ComboBoxEx();
this.tbxMOSLandyloc = new DevComponents.DotNetBar.Controls.TextBoxX();
this.tbxMOSLandxloc = new DevComponents.DotNetBar.Controls.TextBoxX();
this.lblMOSLandcorner = new System.Windows.Forms.Label();
this.lblMOSLandyloc = new System.Windows.Forms.Label();
this.lblMOSLandxloc = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.docVersionConfigBindingSource)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.docVersionConfigBindingSource)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.imageCodecInfoBindingSource)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.imageCodecInfoBindingSource)).BeginInit();
this.ppGpbxUserSpecCB.SuspendLayout(); this.ppGpbxUserSpecCB.SuspendLayout();
this.ppGpbxUserSpecTxt.SuspendLayout(); this.ppGpbxUserSpecTxt.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.tcVersions)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tcVersions)).BeginInit();
this.tcVersions.SuspendLayout(); this.tcVersions.SuspendLayout();
this.tabControlPanel2.SuspendLayout();
this.gpxMOSLandLocation.SuspendLayout();
this.gpxMOSLocation.SuspendLayout();
this.gpxMOSfont.SuspendLayout();
this.tcpGeneral.SuspendLayout(); this.tcpGeneral.SuspendLayout();
this.tcpRefereceObjects.SuspendLayout(); this.tcpRefereceObjects.SuspendLayout();
this.ppGpbxUpROvals.SuspendLayout(); this.ppGpbxUpROvals.SuspendLayout();
this.tabControlPanel2.SuspendLayout();
this.gpxMOSLocation.SuspendLayout();
this.gpxMOSfont.SuspendLayout();
this.tabControlPanel1.SuspendLayout(); this.tabControlPanel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.bsMiniEnhanced)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bsMiniEnhanced)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bsEnhanced)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bsEnhanced)).BeginInit();
@@ -247,14 +248,13 @@ namespace VEPROMS
this.panVerBtns.SuspendLayout(); this.panVerBtns.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.ROPrefixBindingSource)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.ROPrefixBindingSource)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.formatInfoListBindingSource)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.formatInfoListBindingSource)).BeginInit();
this.gpxMOSLandLocation.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
// ppBtnCancel // ppBtnCancel
// //
this.ppBtnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.ppBtnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.ppBtnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; this.ppBtnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.ppBtnCancel.Location = new System.Drawing.Point(742, 342); this.ppBtnCancel.Location = new System.Drawing.Point(742, 338);
this.ppBtnCancel.Margin = new System.Windows.Forms.Padding(2); this.ppBtnCancel.Margin = new System.Windows.Forms.Padding(2);
this.ppBtnCancel.Name = "ppBtnCancel"; this.ppBtnCancel.Name = "ppBtnCancel";
this.ppBtnCancel.Size = new System.Drawing.Size(56, 21); this.ppBtnCancel.Size = new System.Drawing.Size(56, 21);
@@ -266,7 +266,7 @@ namespace VEPROMS
// ppBtnOK // ppBtnOK
// //
this.ppBtnOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.ppBtnOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.ppBtnOK.Location = new System.Drawing.Point(669, 342); this.ppBtnOK.Location = new System.Drawing.Point(669, 338);
this.ppBtnOK.Margin = new System.Windows.Forms.Padding(2); this.ppBtnOK.Margin = new System.Windows.Forms.Padding(2);
this.ppBtnOK.Name = "ppBtnOK"; this.ppBtnOK.Name = "ppBtnOK";
this.ppBtnOK.Size = new System.Drawing.Size(56, 21); this.ppBtnOK.Size = new System.Drawing.Size(56, 21);
@@ -1102,9 +1102,9 @@ namespace VEPROMS
this.tcVersions.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.tcVersions.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.tcVersions.BackColor = System.Drawing.Color.Transparent; this.tcVersions.BackColor = System.Drawing.Color.Transparent;
this.tcVersions.CanReorderTabs = true; this.tcVersions.CanReorderTabs = true;
this.tcVersions.Controls.Add(this.tabControlPanel2);
this.tcVersions.Controls.Add(this.tcpGeneral);
this.tcVersions.Controls.Add(this.tcpRefereceObjects); this.tcVersions.Controls.Add(this.tcpRefereceObjects);
this.tcVersions.Controls.Add(this.tcpGeneral);
this.tcVersions.Controls.Add(this.tabControlPanel2);
this.tcVersions.Controls.Add(this.tabControlPanel1); this.tcVersions.Controls.Add(this.tabControlPanel1);
this.tcVersions.Controls.Add(this.tcpApplicability); this.tcVersions.Controls.Add(this.tcpApplicability);
this.tcVersions.Controls.Add(this.tabControlPanel5); this.tcVersions.Controls.Add(this.tabControlPanel5);
@@ -1130,173 +1130,6 @@ namespace VEPROMS
this.tcVersions.TabsVisible = false; this.tcVersions.TabsVisible = false;
this.tcVersions.Text = "tabControl1"; this.tcVersions.Text = "tabControl1";
// //
// tcpGeneral
//
this.tcpGeneral.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
this.tcpGeneral.Controls.Add(this.ppCmbxProcSetType);
this.tcpGeneral.Controls.Add(this.ppRTxtName);
this.tcpGeneral.Controls.Add(this.label9);
this.tcpGeneral.Controls.Add(this.ppRTxtProcSetRev);
this.tcpGeneral.Controls.Add(this.lblProcSetRev);
this.tcpGeneral.Controls.Add(this.label4);
this.tcpGeneral.Controls.Add(this.label3);
this.tcpGeneral.Controls.Add(this.ppRTxtTitle);
this.tcpGeneral.Controls.Add(this.ppTxtBxUserID);
this.tcpGeneral.Controls.Add(this.ppDTPicker);
this.tcpGeneral.Controls.Add(this.label2);
this.tcpGeneral.Controls.Add(this.label1);
this.tcpGeneral.DisabledBackColor = System.Drawing.Color.Empty;
this.tcpGeneral.Dock = System.Windows.Forms.DockStyle.Fill;
this.tcpGeneral.Location = new System.Drawing.Point(0, 22);
this.tcpGeneral.Margin = new System.Windows.Forms.Padding(2);
this.tcpGeneral.Name = "tcpGeneral";
this.tcpGeneral.Padding = new System.Windows.Forms.Padding(2);
this.tcpGeneral.Size = new System.Drawing.Size(625, 311);
this.tcpGeneral.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254)))));
this.tcpGeneral.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227)))));
this.tcpGeneral.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
this.tcpGeneral.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199)))));
this.tcpGeneral.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right)
| DevComponents.DotNetBar.eBorderSide.Bottom)));
this.tcpGeneral.Style.GradientAngle = 90;
this.tcpGeneral.TabIndex = 1;
this.tcpGeneral.TabItem = this.tiGeneral;
//
// tiGeneral
//
this.tiGeneral.AttachedControl = this.tcpGeneral;
this.tiGeneral.Name = "tiGeneral";
this.tiGeneral.Text = "General";
//
// tcpRefereceObjects
//
this.tcpRefereceObjects.Controls.Add(this.ppBtnRoToSql);
this.tcpRefereceObjects.Controls.Add(this.tbRoDb);
this.tcpRefereceObjects.Controls.Add(this.ppBtnRoDbBrowse);
this.tcpRefereceObjects.Controls.Add(this.btnRoDbProperties);
this.tcpRefereceObjects.Controls.Add(this.cmbRoDb);
this.tcpRefereceObjects.Controls.Add(this.ppGpbxUpROvals);
this.tcpRefereceObjects.Controls.Add(this.label6);
this.tcpRefereceObjects.DisabledBackColor = System.Drawing.Color.Empty;
this.tcpRefereceObjects.Dock = System.Windows.Forms.DockStyle.Fill;
this.tcpRefereceObjects.Location = new System.Drawing.Point(0, 22);
this.tcpRefereceObjects.Margin = new System.Windows.Forms.Padding(2);
this.tcpRefereceObjects.Name = "tcpRefereceObjects";
this.tcpRefereceObjects.Padding = new System.Windows.Forms.Padding(2);
this.tcpRefereceObjects.Size = new System.Drawing.Size(625, 311);
this.tcpRefereceObjects.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254)))));
this.tcpRefereceObjects.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227)))));
this.tcpRefereceObjects.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
this.tcpRefereceObjects.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199)))));
this.tcpRefereceObjects.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right)
| DevComponents.DotNetBar.eBorderSide.Bottom)));
this.tcpRefereceObjects.Style.GradientAngle = 90;
this.tcpRefereceObjects.TabIndex = 2;
this.tcpRefereceObjects.TabItem = this.tiRefObjs;
this.tcpRefereceObjects.Enter += new System.EventHandler(this.tabpage_Enter);
//
// ppBtnRoToSql
//
this.ppBtnRoToSql.Location = new System.Drawing.Point(337, 146);
this.ppBtnRoToSql.Name = "ppBtnRoToSql";
this.ppBtnRoToSql.Size = new System.Drawing.Size(163, 46);
this.ppBtnRoToSql.TabIndex = 48;
this.ppBtnRoToSql.Text = "Migrate Data to Sql";
this.ppBtnRoToSql.UseVisualStyleBackColor = true;
this.ppBtnRoToSql.Visible = false;
this.ppBtnRoToSql.Click += new System.EventHandler(this.ppBtnRoToSql_Click);
//
// tbRoDb
//
this.tbRoDb.Enabled = false;
this.tbRoDb.Location = new System.Drawing.Point(80, 13);
this.tbRoDb.Margin = new System.Windows.Forms.Padding(2);
this.tbRoDb.Name = "tbRoDb";
this.tbRoDb.Size = new System.Drawing.Size(318, 20);
this.tbRoDb.TabIndex = 20;
//
// ppBtnRoDbBrowse
//
this.ppBtnRoDbBrowse.Location = new System.Drawing.Point(406, 34);
this.ppBtnRoDbBrowse.Margin = new System.Windows.Forms.Padding(2);
this.ppBtnRoDbBrowse.Name = "ppBtnRoDbBrowse";
this.ppBtnRoDbBrowse.Size = new System.Drawing.Size(51, 20);
this.ppBtnRoDbBrowse.TabIndex = 22;
this.ppBtnRoDbBrowse.Text = "Browse...";
this.ppBtnRoDbBrowse.UseVisualStyleBackColor = true;
this.ppBtnRoDbBrowse.Click += new System.EventHandler(this.ppBtnRoDbBrowse_Click);
//
// btnRoDbProperties
//
this.btnRoDbProperties.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
this.btnRoDbProperties.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
this.btnRoDbProperties.Image = ((System.Drawing.Image)(resources.GetObject("btnRoDbProperties.Image")));
this.btnRoDbProperties.Location = new System.Drawing.Point(406, 10);
this.btnRoDbProperties.Margin = new System.Windows.Forms.Padding(2);
this.btnRoDbProperties.Name = "btnRoDbProperties";
this.btnRoDbProperties.Size = new System.Drawing.Size(33, 23);
this.btnRoDbProperties.TabIndex = 21;
this.btnRoDbProperties.Click += new System.EventHandler(this.btnRoDbProperties_Click);
//
// cmbRoDb
//
this.cmbRoDb.FormattingEnabled = true;
this.cmbRoDb.Location = new System.Drawing.Point(80, 13);
this.cmbRoDb.Margin = new System.Windows.Forms.Padding(2);
this.cmbRoDb.Name = "cmbRoDb";
this.cmbRoDb.Size = new System.Drawing.Size(318, 21);
this.cmbRoDb.TabIndex = 47;
this.cmbRoDb.SelectedIndexChanged += new System.EventHandler(this.cmbRoDb_SelectedIndexChanged);
//
// ppGpbxUpROvals
//
this.ppGpbxUpROvals.BackColor = System.Drawing.Color.Transparent;
this.ppGpbxUpROvals.CanvasColor = System.Drawing.SystemColors.Control;
this.ppGpbxUpROvals.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
this.ppGpbxUpROvals.Controls.Add(this.ppBtnResetRoVals);
this.ppGpbxUpROvals.Controls.Add(this.ppBtnUpRoVals);
this.ppGpbxUpROvals.DisabledBackColor = System.Drawing.Color.Empty;
this.ppGpbxUpROvals.Location = new System.Drawing.Point(34, 69);
this.ppGpbxUpROvals.Margin = new System.Windows.Forms.Padding(2);
this.ppGpbxUpROvals.Name = "ppGpbxUpROvals";
this.ppGpbxUpROvals.Size = new System.Drawing.Size(112, 162);
//
//
//
this.ppGpbxUpROvals.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
this.ppGpbxUpROvals.Style.BackColorGradientAngle = 90;
this.ppGpbxUpROvals.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
this.ppGpbxUpROvals.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.ppGpbxUpROvals.Style.BorderBottomWidth = 1;
this.ppGpbxUpROvals.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
this.ppGpbxUpROvals.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.ppGpbxUpROvals.Style.BorderLeftWidth = 1;
this.ppGpbxUpROvals.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.ppGpbxUpROvals.Style.BorderRightWidth = 1;
this.ppGpbxUpROvals.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.ppGpbxUpROvals.Style.BorderTopWidth = 1;
this.ppGpbxUpROvals.Style.CornerDiameter = 4;
this.ppGpbxUpROvals.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
this.ppGpbxUpROvals.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
this.ppGpbxUpROvals.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
this.ppGpbxUpROvals.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
//
//
//
this.ppGpbxUpROvals.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
//
//
//
this.ppGpbxUpROvals.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.ppGpbxUpROvals.TabIndex = 46;
this.ppGpbxUpROvals.Text = "RO Values";
//
// tiRefObjs
//
this.tiRefObjs.AttachedControl = this.tcpRefereceObjects;
this.tiRefObjs.Name = "tiRefObjs";
this.tiRefObjs.Text = "Referenced Objects";
//
// tabControlPanel2 // tabControlPanel2
// //
this.tabControlPanel2.Controls.Add(this.gpxMOSLandLocation); this.tabControlPanel2.Controls.Add(this.gpxMOSLandLocation);
@@ -1324,6 +1157,128 @@ namespace VEPROMS
this.tabControlPanel2.TabIndex = 30; this.tabControlPanel2.TabIndex = 30;
this.tabControlPanel2.TabItem = this.tiMergedOutputSettings; this.tabControlPanel2.TabItem = this.tiMergedOutputSettings;
// //
// gpxMOSLandLocation
//
this.gpxMOSLandLocation.BackColor = System.Drawing.Color.Transparent;
this.gpxMOSLandLocation.CanvasColor = System.Drawing.SystemColors.Control;
this.gpxMOSLandLocation.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
this.gpxMOSLandLocation.Controls.Add(this.ppCmbxMOSLandcornerLoc);
this.gpxMOSLandLocation.Controls.Add(this.tbxMOSLandyloc);
this.gpxMOSLandLocation.Controls.Add(this.tbxMOSLandxloc);
this.gpxMOSLandLocation.Controls.Add(this.lblMOSLandcorner);
this.gpxMOSLandLocation.Controls.Add(this.lblMOSLandyloc);
this.gpxMOSLandLocation.Controls.Add(this.lblMOSLandxloc);
this.gpxMOSLandLocation.DisabledBackColor = System.Drawing.Color.Empty;
this.gpxMOSLandLocation.Location = new System.Drawing.Point(284, 164);
this.gpxMOSLandLocation.Margin = new System.Windows.Forms.Padding(2);
this.gpxMOSLandLocation.Name = "gpxMOSLandLocation";
this.gpxMOSLandLocation.Size = new System.Drawing.Size(209, 98);
//
//
//
this.gpxMOSLandLocation.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
this.gpxMOSLandLocation.Style.BackColorGradientAngle = 90;
this.gpxMOSLandLocation.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
this.gpxMOSLandLocation.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.gpxMOSLandLocation.Style.BorderBottomWidth = 1;
this.gpxMOSLandLocation.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
this.gpxMOSLandLocation.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.gpxMOSLandLocation.Style.BorderLeftWidth = 1;
this.gpxMOSLandLocation.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.gpxMOSLandLocation.Style.BorderRightWidth = 1;
this.gpxMOSLandLocation.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.gpxMOSLandLocation.Style.BorderTopWidth = 1;
this.gpxMOSLandLocation.Style.CornerDiameter = 4;
this.gpxMOSLandLocation.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
this.gpxMOSLandLocation.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
this.gpxMOSLandLocation.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
this.gpxMOSLandLocation.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
//
//
//
this.gpxMOSLandLocation.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
//
//
//
this.gpxMOSLandLocation.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.gpxMOSLandLocation.TabIndex = 7;
this.gpxMOSLandLocation.Text = "Landscape Location";
//
// ppCmbxMOSLandcornerLoc
//
this.ppCmbxMOSLandcornerLoc.DisplayMember = "Text";
this.ppCmbxMOSLandcornerLoc.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
this.ppCmbxMOSLandcornerLoc.FormattingEnabled = true;
this.ppCmbxMOSLandcornerLoc.ItemHeight = 16;
this.ppCmbxMOSLandcornerLoc.Location = new System.Drawing.Point(59, 53);
this.ppCmbxMOSLandcornerLoc.Margin = new System.Windows.Forms.Padding(2);
this.ppCmbxMOSLandcornerLoc.Name = "ppCmbxMOSLandcornerLoc";
this.ppCmbxMOSLandcornerLoc.Size = new System.Drawing.Size(144, 22);
this.ppCmbxMOSLandcornerLoc.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.ppCmbxMOSLandcornerLoc.TabIndex = 9;
this.ppCmbxMOSLandcornerLoc.WatermarkText = "corner location";
//
// tbxMOSLandyloc
//
//
//
//
this.tbxMOSLandyloc.Border.Class = "TextBoxBorder";
this.tbxMOSLandyloc.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.tbxMOSLandyloc.Location = new System.Drawing.Point(62, 30);
this.tbxMOSLandyloc.Margin = new System.Windows.Forms.Padding(2);
this.tbxMOSLandyloc.Name = "tbxMOSLandyloc";
this.tbxMOSLandyloc.PreventEnterBeep = true;
this.tbxMOSLandyloc.Size = new System.Drawing.Size(75, 20);
this.tbxMOSLandyloc.TabIndex = 8;
//
// tbxMOSLandxloc
//
//
//
//
this.tbxMOSLandxloc.Border.Class = "TextBoxBorder";
this.tbxMOSLandxloc.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.tbxMOSLandxloc.Location = new System.Drawing.Point(62, 10);
this.tbxMOSLandxloc.Margin = new System.Windows.Forms.Padding(2);
this.tbxMOSLandxloc.Name = "tbxMOSLandxloc";
this.tbxMOSLandxloc.PreventEnterBeep = true;
this.tbxMOSLandxloc.Size = new System.Drawing.Size(75, 20);
this.tbxMOSLandxloc.TabIndex = 7;
//
// lblMOSLandcorner
//
this.lblMOSLandcorner.AutoSize = true;
this.lblMOSLandcorner.BackColor = System.Drawing.Color.Transparent;
this.lblMOSLandcorner.Location = new System.Drawing.Point(14, 54);
this.lblMOSLandcorner.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblMOSLandcorner.Name = "lblMOSLandcorner";
this.lblMOSLandcorner.Size = new System.Drawing.Size(41, 13);
this.lblMOSLandcorner.TabIndex = 6;
this.lblMOSLandcorner.Text = "Corner:";
//
// lblMOSLandyloc
//
this.lblMOSLandyloc.AutoSize = true;
this.lblMOSLandyloc.BackColor = System.Drawing.Color.Transparent;
this.lblMOSLandyloc.Location = new System.Drawing.Point(14, 32);
this.lblMOSLandyloc.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblMOSLandyloc.Name = "lblMOSLandyloc";
this.lblMOSLandyloc.Size = new System.Drawing.Size(34, 13);
this.lblMOSLandyloc.TabIndex = 5;
this.lblMOSLandyloc.Text = "Y (in):";
//
// lblMOSLandxloc
//
this.lblMOSLandxloc.AutoSize = true;
this.lblMOSLandxloc.BackColor = System.Drawing.Color.Transparent;
this.lblMOSLandxloc.Location = new System.Drawing.Point(14, 10);
this.lblMOSLandxloc.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblMOSLandxloc.Name = "lblMOSLandxloc";
this.lblMOSLandxloc.Size = new System.Drawing.Size(34, 13);
this.lblMOSLandxloc.TabIndex = 4;
this.lblMOSLandxloc.Text = "X (in):";
//
// ppChbxMOSview // ppChbxMOSview
// //
this.ppChbxMOSview.BackColor = System.Drawing.Color.Transparent; this.ppChbxMOSview.BackColor = System.Drawing.Color.Transparent;
@@ -1613,6 +1568,174 @@ namespace VEPROMS
this.tiMergedOutputSettings.Name = "tiMergedOutputSettings"; this.tiMergedOutputSettings.Name = "tiMergedOutputSettings";
this.tiMergedOutputSettings.Text = "Merged Output Settings"; this.tiMergedOutputSettings.Text = "Merged Output Settings";
// //
// tcpGeneral
//
this.tcpGeneral.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
this.tcpGeneral.Controls.Add(this.ppCmbxProcSetType);
this.tcpGeneral.Controls.Add(this.ppRTxtName);
this.tcpGeneral.Controls.Add(this.label9);
this.tcpGeneral.Controls.Add(this.ppRTxtProcSetRev);
this.tcpGeneral.Controls.Add(this.lblProcSetRev);
this.tcpGeneral.Controls.Add(this.label4);
this.tcpGeneral.Controls.Add(this.label3);
this.tcpGeneral.Controls.Add(this.ppRTxtTitle);
this.tcpGeneral.Controls.Add(this.ppTxtBxUserID);
this.tcpGeneral.Controls.Add(this.ppDTPicker);
this.tcpGeneral.Controls.Add(this.label2);
this.tcpGeneral.Controls.Add(this.label1);
this.tcpGeneral.DisabledBackColor = System.Drawing.Color.Empty;
this.tcpGeneral.Dock = System.Windows.Forms.DockStyle.Fill;
this.tcpGeneral.Location = new System.Drawing.Point(0, 22);
this.tcpGeneral.Margin = new System.Windows.Forms.Padding(2);
this.tcpGeneral.Name = "tcpGeneral";
this.tcpGeneral.Padding = new System.Windows.Forms.Padding(2);
this.tcpGeneral.Size = new System.Drawing.Size(625, 311);
this.tcpGeneral.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254)))));
this.tcpGeneral.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227)))));
this.tcpGeneral.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
this.tcpGeneral.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199)))));
this.tcpGeneral.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right)
| DevComponents.DotNetBar.eBorderSide.Bottom)));
this.tcpGeneral.Style.GradientAngle = 90;
this.tcpGeneral.TabIndex = 1;
this.tcpGeneral.TabItem = this.tiGeneral;
//
// tiGeneral
//
this.tiGeneral.AttachedControl = this.tcpGeneral;
this.tiGeneral.Name = "tiGeneral";
this.tiGeneral.Text = "General";
//
// tcpRefereceObjects
//
this.tcpRefereceObjects.Controls.Add(this.ppBtnRoToSql);
this.tcpRefereceObjects.Controls.Add(this.tbRoDb);
this.tcpRefereceObjects.Controls.Add(this.ppBtnRoDbBrowse);
this.tcpRefereceObjects.Controls.Add(this.btnRoDbProperties);
this.tcpRefereceObjects.Controls.Add(this.cmbRoDb);
this.tcpRefereceObjects.Controls.Add(this.ppGpbxUpROvals);
this.tcpRefereceObjects.Controls.Add(this.label6);
this.tcpRefereceObjects.DisabledBackColor = System.Drawing.Color.Empty;
this.tcpRefereceObjects.Dock = System.Windows.Forms.DockStyle.Fill;
this.tcpRefereceObjects.Location = new System.Drawing.Point(0, 22);
this.tcpRefereceObjects.Margin = new System.Windows.Forms.Padding(2);
this.tcpRefereceObjects.Name = "tcpRefereceObjects";
this.tcpRefereceObjects.Padding = new System.Windows.Forms.Padding(2);
this.tcpRefereceObjects.Size = new System.Drawing.Size(625, 311);
this.tcpRefereceObjects.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254)))));
this.tcpRefereceObjects.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227)))));
this.tcpRefereceObjects.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
this.tcpRefereceObjects.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199)))));
this.tcpRefereceObjects.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right)
| DevComponents.DotNetBar.eBorderSide.Bottom)));
this.tcpRefereceObjects.Style.GradientAngle = 90;
this.tcpRefereceObjects.TabIndex = 2;
this.tcpRefereceObjects.TabItem = this.tiRefObjs;
this.tcpRefereceObjects.Enter += new System.EventHandler(this.tabpage_Enter);
//
// ppBtnRoToSql
//
this.ppBtnRoToSql.Location = new System.Drawing.Point(337, 146);
this.ppBtnRoToSql.Name = "ppBtnRoToSql";
this.ppBtnRoToSql.Size = new System.Drawing.Size(163, 46);
this.ppBtnRoToSql.TabIndex = 48;
this.ppBtnRoToSql.Text = "Migrate Data to Sql";
this.ppBtnRoToSql.UseVisualStyleBackColor = true;
this.ppBtnRoToSql.Visible = false;
this.ppBtnRoToSql.Click += new System.EventHandler(this.ppBtnRoToSql_Click);
//
// tbRoDb
//
this.tbRoDb.Enabled = false;
this.tbRoDb.Location = new System.Drawing.Point(80, 13);
this.tbRoDb.Margin = new System.Windows.Forms.Padding(2);
this.tbRoDb.Name = "tbRoDb";
this.tbRoDb.Size = new System.Drawing.Size(318, 20);
this.tbRoDb.TabIndex = 20;
this.tbRoDb.TextChanged += new System.EventHandler(this.tbRoDb_TextChanged);
//
// ppBtnRoDbBrowse
//
this.ppBtnRoDbBrowse.Location = new System.Drawing.Point(406, 34);
this.ppBtnRoDbBrowse.Margin = new System.Windows.Forms.Padding(2);
this.ppBtnRoDbBrowse.Name = "ppBtnRoDbBrowse";
this.ppBtnRoDbBrowse.Size = new System.Drawing.Size(51, 20);
this.ppBtnRoDbBrowse.TabIndex = 22;
this.ppBtnRoDbBrowse.Text = "Browse...";
this.ppBtnRoDbBrowse.UseVisualStyleBackColor = true;
this.ppBtnRoDbBrowse.Click += new System.EventHandler(this.ppBtnRoDbBrowse_Click);
//
// btnRoDbProperties
//
this.btnRoDbProperties.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
this.btnRoDbProperties.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
this.btnRoDbProperties.Image = ((System.Drawing.Image)(resources.GetObject("btnRoDbProperties.Image")));
this.btnRoDbProperties.Location = new System.Drawing.Point(406, 10);
this.btnRoDbProperties.Margin = new System.Windows.Forms.Padding(2);
this.btnRoDbProperties.Name = "btnRoDbProperties";
this.btnRoDbProperties.Size = new System.Drawing.Size(33, 23);
this.btnRoDbProperties.TabIndex = 21;
this.btnRoDbProperties.Click += new System.EventHandler(this.btnRoDbProperties_Click);
//
// cmbRoDb
//
this.cmbRoDb.FormattingEnabled = true;
this.cmbRoDb.Location = new System.Drawing.Point(80, 13);
this.cmbRoDb.Margin = new System.Windows.Forms.Padding(2);
this.cmbRoDb.Name = "cmbRoDb";
this.cmbRoDb.Size = new System.Drawing.Size(318, 21);
this.cmbRoDb.TabIndex = 47;
this.cmbRoDb.SelectedIndexChanged += new System.EventHandler(this.cmbRoDb_SelectedIndexChanged);
//
// ppGpbxUpROvals
//
this.ppGpbxUpROvals.BackColor = System.Drawing.Color.Transparent;
this.ppGpbxUpROvals.CanvasColor = System.Drawing.SystemColors.Control;
this.ppGpbxUpROvals.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
this.ppGpbxUpROvals.Controls.Add(this.ppBtnResetRoVals);
this.ppGpbxUpROvals.Controls.Add(this.ppBtnUpRoVals);
this.ppGpbxUpROvals.DisabledBackColor = System.Drawing.Color.Empty;
this.ppGpbxUpROvals.Location = new System.Drawing.Point(34, 69);
this.ppGpbxUpROvals.Margin = new System.Windows.Forms.Padding(2);
this.ppGpbxUpROvals.Name = "ppGpbxUpROvals";
this.ppGpbxUpROvals.Size = new System.Drawing.Size(112, 162);
//
//
//
this.ppGpbxUpROvals.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
this.ppGpbxUpROvals.Style.BackColorGradientAngle = 90;
this.ppGpbxUpROvals.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
this.ppGpbxUpROvals.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.ppGpbxUpROvals.Style.BorderBottomWidth = 1;
this.ppGpbxUpROvals.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
this.ppGpbxUpROvals.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.ppGpbxUpROvals.Style.BorderLeftWidth = 1;
this.ppGpbxUpROvals.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.ppGpbxUpROvals.Style.BorderRightWidth = 1;
this.ppGpbxUpROvals.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.ppGpbxUpROvals.Style.BorderTopWidth = 1;
this.ppGpbxUpROvals.Style.CornerDiameter = 4;
this.ppGpbxUpROvals.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
this.ppGpbxUpROvals.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
this.ppGpbxUpROvals.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
this.ppGpbxUpROvals.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
//
//
//
this.ppGpbxUpROvals.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
//
//
//
this.ppGpbxUpROvals.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.ppGpbxUpROvals.TabIndex = 46;
this.ppGpbxUpROvals.Text = "RO Values";
//
// tiRefObjs
//
this.tiRefObjs.AttachedControl = this.tcpRefereceObjects;
this.tiRefObjs.Name = "tiRefObjs";
this.tiRefObjs.Text = "Referenced Objects";
//
// tabControlPanel1 // tabControlPanel1
// //
this.tabControlPanel1.Controls.Add(this.ppChbxEnhancedAllowMods); this.tabControlPanel1.Controls.Add(this.ppChbxEnhancedAllowMods);
@@ -2172,14 +2295,14 @@ namespace VEPROMS
this.documentEntryCountDataGridViewTextBoxColumn, this.documentEntryCountDataGridViewTextBoxColumn,
this.libTitleDataGridViewTextBoxColumn}); this.libTitleDataGridViewTextBoxColumn});
this.ppGrdLibDocList.DataSource = this.documentInfoListBindingSource; this.ppGrdLibDocList.DataSource = this.documentInfoListBindingSource;
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window;
dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); dataGridViewCellStyle4.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText;
dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.ControlText; dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.ControlText;
dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.ppGrdLibDocList.DefaultCellStyle = dataGridViewCellStyle2; this.ppGrdLibDocList.DefaultCellStyle = dataGridViewCellStyle4;
this.ppGrdLibDocList.Dock = System.Windows.Forms.DockStyle.Fill; this.ppGrdLibDocList.Dock = System.Windows.Forms.DockStyle.Fill;
this.ppGrdLibDocList.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); this.ppGrdLibDocList.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229)))));
this.ppGrdLibDocList.HighlightSelectedColumnHeaders = false; this.ppGrdLibDocList.HighlightSelectedColumnHeaders = false;
@@ -2196,8 +2319,8 @@ namespace VEPROMS
// documentEntryCountDataGridViewTextBoxColumn // documentEntryCountDataGridViewTextBoxColumn
// //
this.documentEntryCountDataGridViewTextBoxColumn.DataPropertyName = "DocumentEntryCount"; this.documentEntryCountDataGridViewTextBoxColumn.DataPropertyName = "DocumentEntryCount";
dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.documentEntryCountDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle1; this.documentEntryCountDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle3;
this.documentEntryCountDataGridViewTextBoxColumn.HeaderText = "Number of Usages"; this.documentEntryCountDataGridViewTextBoxColumn.HeaderText = "Number of Usages";
this.documentEntryCountDataGridViewTextBoxColumn.Name = "documentEntryCountDataGridViewTextBoxColumn"; this.documentEntryCountDataGridViewTextBoxColumn.Name = "documentEntryCountDataGridViewTextBoxColumn";
this.documentEntryCountDataGridViewTextBoxColumn.ReadOnly = true; this.documentEntryCountDataGridViewTextBoxColumn.ReadOnly = true;
@@ -2664,132 +2787,14 @@ namespace VEPROMS
this.btnGeneral.Text = "General"; this.btnGeneral.Text = "General";
this.btnGeneral.Click += new System.EventHandler(this.btnGeneral_Click); this.btnGeneral.Click += new System.EventHandler(this.btnGeneral_Click);
// //
// ROPrefixBindingSource
//
this.ROPrefixBindingSource.CurrentChanged += new System.EventHandler(this.ROPrefixBindingSource_CurrentChanged);
//
// formatInfoListBindingSource // formatInfoListBindingSource
// //
this.formatInfoListBindingSource.DataSource = typeof(VEPROMS.CSLA.Library.FormatInfo); this.formatInfoListBindingSource.DataSource = typeof(VEPROMS.CSLA.Library.FormatInfo);
// //
// gpxMOSLandLocation
//
this.gpxMOSLandLocation.BackColor = System.Drawing.Color.Transparent;
this.gpxMOSLandLocation.CanvasColor = System.Drawing.SystemColors.Control;
this.gpxMOSLandLocation.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
this.gpxMOSLandLocation.Controls.Add(this.ppCmbxMOSLandcornerLoc);
this.gpxMOSLandLocation.Controls.Add(this.tbxMOSLandyloc);
this.gpxMOSLandLocation.Controls.Add(this.tbxMOSLandxloc);
this.gpxMOSLandLocation.Controls.Add(this.lblMOSLandcorner);
this.gpxMOSLandLocation.Controls.Add(this.lblMOSLandyloc);
this.gpxMOSLandLocation.Controls.Add(this.lblMOSLandxloc);
this.gpxMOSLandLocation.DisabledBackColor = System.Drawing.Color.Empty;
this.gpxMOSLandLocation.Location = new System.Drawing.Point(284, 164);
this.gpxMOSLandLocation.Margin = new System.Windows.Forms.Padding(2);
this.gpxMOSLandLocation.Name = "gpxMOSLandLocation";
this.gpxMOSLandLocation.Size = new System.Drawing.Size(209, 98);
//
//
//
this.gpxMOSLandLocation.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
this.gpxMOSLandLocation.Style.BackColorGradientAngle = 90;
this.gpxMOSLandLocation.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
this.gpxMOSLandLocation.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.gpxMOSLandLocation.Style.BorderBottomWidth = 1;
this.gpxMOSLandLocation.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
this.gpxMOSLandLocation.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.gpxMOSLandLocation.Style.BorderLeftWidth = 1;
this.gpxMOSLandLocation.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.gpxMOSLandLocation.Style.BorderRightWidth = 1;
this.gpxMOSLandLocation.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.gpxMOSLandLocation.Style.BorderTopWidth = 1;
this.gpxMOSLandLocation.Style.CornerDiameter = 4;
this.gpxMOSLandLocation.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
this.gpxMOSLandLocation.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
this.gpxMOSLandLocation.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
this.gpxMOSLandLocation.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
//
//
//
this.gpxMOSLandLocation.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
//
//
//
this.gpxMOSLandLocation.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.gpxMOSLandLocation.TabIndex = 7;
this.gpxMOSLandLocation.Text = "Landscape Location";
//
// ppCmbxMOSLandcornerLoc
//
this.ppCmbxMOSLandcornerLoc.DisplayMember = "Text";
this.ppCmbxMOSLandcornerLoc.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
this.ppCmbxMOSLandcornerLoc.FormattingEnabled = true;
this.ppCmbxMOSLandcornerLoc.ItemHeight = 16;
this.ppCmbxMOSLandcornerLoc.Location = new System.Drawing.Point(59, 53);
this.ppCmbxMOSLandcornerLoc.Margin = new System.Windows.Forms.Padding(2);
this.ppCmbxMOSLandcornerLoc.Name = "ppCmbxMOSLandcornerLoc";
this.ppCmbxMOSLandcornerLoc.Size = new System.Drawing.Size(144, 22);
this.ppCmbxMOSLandcornerLoc.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.ppCmbxMOSLandcornerLoc.TabIndex = 9;
this.ppCmbxMOSLandcornerLoc.WatermarkText = "corner location";
//
// tbxMOSLandyloc
//
//
//
//
this.tbxMOSLandyloc.Border.Class = "TextBoxBorder";
this.tbxMOSLandyloc.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.tbxMOSLandyloc.Location = new System.Drawing.Point(62, 30);
this.tbxMOSLandyloc.Margin = new System.Windows.Forms.Padding(2);
this.tbxMOSLandyloc.Name = "tbxMOSLandyloc";
this.tbxMOSLandyloc.PreventEnterBeep = true;
this.tbxMOSLandyloc.Size = new System.Drawing.Size(75, 20);
this.tbxMOSLandyloc.TabIndex = 8;
//
// tbxMOSLandxloc
//
//
//
//
this.tbxMOSLandxloc.Border.Class = "TextBoxBorder";
this.tbxMOSLandxloc.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.tbxMOSLandxloc.Location = new System.Drawing.Point(62, 10);
this.tbxMOSLandxloc.Margin = new System.Windows.Forms.Padding(2);
this.tbxMOSLandxloc.Name = "tbxMOSLandxloc";
this.tbxMOSLandxloc.PreventEnterBeep = true;
this.tbxMOSLandxloc.Size = new System.Drawing.Size(75, 20);
this.tbxMOSLandxloc.TabIndex = 7;
//
// lblMOSLandcorner
//
this.lblMOSLandcorner.AutoSize = true;
this.lblMOSLandcorner.BackColor = System.Drawing.Color.Transparent;
this.lblMOSLandcorner.Location = new System.Drawing.Point(14, 54);
this.lblMOSLandcorner.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblMOSLandcorner.Name = "lblMOSLandcorner";
this.lblMOSLandcorner.Size = new System.Drawing.Size(41, 13);
this.lblMOSLandcorner.TabIndex = 6;
this.lblMOSLandcorner.Text = "Corner:";
//
// lblMOSLandyloc
//
this.lblMOSLandyloc.AutoSize = true;
this.lblMOSLandyloc.BackColor = System.Drawing.Color.Transparent;
this.lblMOSLandyloc.Location = new System.Drawing.Point(14, 32);
this.lblMOSLandyloc.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblMOSLandyloc.Name = "lblMOSLandyloc";
this.lblMOSLandyloc.Size = new System.Drawing.Size(34, 13);
this.lblMOSLandyloc.TabIndex = 5;
this.lblMOSLandyloc.Text = "Y (in):";
//
// lblMOSLandxloc
//
this.lblMOSLandxloc.AutoSize = true;
this.lblMOSLandxloc.BackColor = System.Drawing.Color.Transparent;
this.lblMOSLandxloc.Location = new System.Drawing.Point(14, 10);
this.lblMOSLandxloc.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblMOSLandxloc.Name = "lblMOSLandxloc";
this.lblMOSLandxloc.Size = new System.Drawing.Size(34, 13);
this.lblMOSLandxloc.TabIndex = 4;
this.lblMOSLandxloc.Text = "X (in):";
//
// frmVersionsProperties // frmVersionsProperties
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -2797,7 +2802,7 @@ namespace VEPROMS
this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
this.CancelButton = this.ppBtnCancel; this.CancelButton = this.ppBtnCancel;
this.CaptionFont = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.CaptionFont = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.ClientSize = new System.Drawing.Size(806, 365); this.ClientSize = new System.Drawing.Size(802, 361);
this.ControlBox = false; this.ControlBox = false;
this.Controls.Add(this.panVerBtns); this.Controls.Add(this.panVerBtns);
this.Controls.Add(this.tcVersions); this.Controls.Add(this.tcVersions);
@@ -2824,17 +2829,19 @@ namespace VEPROMS
this.ppGpbxUserSpecTxt.PerformLayout(); this.ppGpbxUserSpecTxt.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.tcVersions)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tcVersions)).EndInit();
this.tcVersions.ResumeLayout(false); this.tcVersions.ResumeLayout(false);
this.tabControlPanel2.ResumeLayout(false);
this.tabControlPanel2.PerformLayout();
this.gpxMOSLandLocation.ResumeLayout(false);
this.gpxMOSLandLocation.PerformLayout();
this.gpxMOSLocation.ResumeLayout(false);
this.gpxMOSLocation.PerformLayout();
this.gpxMOSfont.ResumeLayout(false);
this.gpxMOSfont.PerformLayout();
this.tcpGeneral.ResumeLayout(false); this.tcpGeneral.ResumeLayout(false);
this.tcpGeneral.PerformLayout(); this.tcpGeneral.PerformLayout();
this.tcpRefereceObjects.ResumeLayout(false); this.tcpRefereceObjects.ResumeLayout(false);
this.tcpRefereceObjects.PerformLayout(); this.tcpRefereceObjects.PerformLayout();
this.ppGpbxUpROvals.ResumeLayout(false); this.ppGpbxUpROvals.ResumeLayout(false);
this.tabControlPanel2.ResumeLayout(false);
this.tabControlPanel2.PerformLayout();
this.gpxMOSLocation.ResumeLayout(false);
this.gpxMOSLocation.PerformLayout();
this.gpxMOSfont.ResumeLayout(false);
this.gpxMOSfont.PerformLayout();
this.tabControlPanel1.ResumeLayout(false); this.tabControlPanel1.ResumeLayout(false);
this.tabControlPanel1.PerformLayout(); this.tabControlPanel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.bsMiniEnhanced)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bsMiniEnhanced)).EndInit();
@@ -2859,8 +2866,6 @@ namespace VEPROMS
this.panVerBtns.ResumeLayout(false); this.panVerBtns.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.ROPrefixBindingSource)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.ROPrefixBindingSource)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.formatInfoListBindingSource)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.formatInfoListBindingSource)).EndInit();
this.gpxMOSLandLocation.ResumeLayout(false);
this.gpxMOSLandLocation.PerformLayout();
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout(); this.PerformLayout();

View File

@@ -29,6 +29,7 @@ namespace VEPROMS
private List<MiniConfig> _DeletedApples; private List<MiniConfig> _DeletedApples;
private List<EnhancedMiniConfig> _Enhanced; private List<EnhancedMiniConfig> _Enhanced;
private DocVersionConfig _DocVersionConfig; private DocVersionConfig _DocVersionConfig;
private string _OrgPDFPath; // B2024-030 used to save last PDF path
// Default values // Default values
private string _DefaultFormatName = null; private string _DefaultFormatName = null;
@@ -97,6 +98,7 @@ namespace VEPROMS
_Initializing = true; _Initializing = true;
InitializeComponent(); InitializeComponent();
_OrgPDFPath = _DocVersionConfig.Print_PDFLocation; // B2024-030 save last PDF path
btnGeneral.PerformClick(); // always start with General tab or button btnGeneral.PerformClick(); // always start with General tab or button
_Initializing = false; _Initializing = false;
@@ -323,8 +325,6 @@ namespace VEPROMS
tiApplicability.Visible = false; tiApplicability.Visible = false;
} }
ppTxtBxPDFLoc.TextChanged += new EventHandler(ppTxtBxPDFLoc_TextChanged);
//end add new applicability stuff //end add new applicability stuff
lblProcSetRev.Visible = ppRTxtProcSetRev.Visible = _DocVersionConfig.MyDocVersion.MyDocVersionInfo.ActiveFormat.MyStepSectionPrintData.UseXtraRevNumber; lblProcSetRev.Visible = ppRTxtProcSetRev.Visible = _DocVersionConfig.MyDocVersion.MyDocVersionInfo.ActiveFormat.MyStepSectionPrintData.UseXtraRevNumber;
@@ -538,11 +538,32 @@ namespace VEPROMS
} }
} }
// The following code was added to fix Bug B2013-117 //B2024-030 Check the PDF Location path and prompt to create the folders if needed
private void ppTxtBxPDFLoc_TextChanged(object sender, EventArgs e) private void CheckPDFLocationPath()
{ {
if (_Initializing == false) string pdfloc = ppTxtBxPDFLoc.Text;
_DocVersionConfig.Print_PDFLocation = ppTxtBxPDFLoc.Text; if (pdfloc == string.Empty) return;
if (!Directory.Exists(ppTxtBxPDFLoc.Text))
{
string msg = string.Format(" The Folder: '{0}' does not exist. \n\nCreate it?", ppTxtBxPDFLoc.Text);
DialogResult dr = MessageBox.Show(msg, "PDF Location Folder Not Found", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
if (dr == DialogResult.Yes)
{
try
{
Directory.CreateDirectory(ppTxtBxPDFLoc.Text);
}
catch (Exception ex)
{
MessageBox.Show(ex.Message, "Error trying to create folder", MessageBoxButtons.OK, MessageBoxIcon.Error);
_DocVersionConfig.Print_PDFLocation = _OrgPDFPath; // reset to the path we started with
}
}
else
{
_DocVersionConfig.Print_PDFLocation = _OrgPDFPath; // reset to the path we started with
}
}
} }
private string AddSlaveNode(MiniConfig mc) private string AddSlaveNode(MiniConfig mc)
@@ -588,6 +609,9 @@ namespace VEPROMS
private void btnVersionsPropOK_Click(object sender, EventArgs e) private void btnVersionsPropOK_Click(object sender, EventArgs e)
{ {
//B2024-030 Check the PDF Location path and prompt to create the folders if needed
CheckPDFLocationPath();
docVersionConfigBindingSource.EndEdit(); // need to end the edit session first or any format selection chanage will not stick B2015-157 docVersionConfigBindingSource.EndEdit(); // need to end the edit session first or any format selection chanage will not stick B2015-157
// if there is a change to the format, clean up any overridden formats that point to the selected item before saving the format change: // if there is a change to the format, clean up any overridden formats that point to the selected item before saving the format change:
@@ -773,7 +797,6 @@ namespace VEPROMS
// B2019-132 update the association count for this working draft // B2019-132 update the association count for this working draft
_DocVersionConfig.MyDocVersion.MyDocVersionInfo.RefreshDocVersionAssociations(); _DocVersionConfig.MyDocVersion.MyDocVersionInfo.RefreshDocVersionAssociations();
this.Close(); this.Close();
} }
@@ -1928,6 +1951,16 @@ namespace VEPROMS
#endregion #endregion
#endregion #endregion
private void tbRoDb_TextChanged(object sender, EventArgs e)
{
}
private void ROPrefixBindingSource_CurrentChanged(object sender, EventArgs e)
{
}
} }

View File

@@ -123,6 +123,12 @@
<metadata name="docVersionConfigBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="docVersionConfigBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>415, 17</value> <value>415, 17</value>
</metadata> </metadata>
<metadata name="docVersionConfigBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>415, 17</value>
</metadata>
<metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>643, 17</value>
</metadata>
<data name="ppCmbxFormat.SuperTooltip" xml:space="preserve"> <data name="ppCmbxFormat.SuperTooltip" xml:space="preserve">
<value>Allows you to specify the default format to use for all procedures in this set. <value>Allows you to specify the default format to use for all procedures in this set.
@@ -210,9 +216,21 @@ Check "Show Default Settings" to display the "default" duplexing setting (below
<metadata name="bsEnhanced.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="bsEnhanced.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>817, 17</value> <value>817, 17</value>
</metadata> </metadata>
<metadata name="bsMiniEnhanced.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 65</value>
</metadata>
<metadata name="bsEnhanced.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>817, 17</value>
</metadata>
<metadata name="bsMiniApple.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="bsMiniApple.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>118, 17</value> <value>118, 17</value>
</metadata> </metadata>
<metadata name="bsMiniApple.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>118, 17</value>
</metadata>
<metadata name="bsApples.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="bsApples.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="bsApples.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value> <value>17, 17</value>
</metadata> </metadata>

View File

@@ -285,16 +285,22 @@ namespace VEPROMS.CSLA.Library
#region ROTextConvertMethods #region ROTextConvertMethods
// B2023-037: Handle <=, >=, +-, -> and <- symbols. Convert to unicode for output, i.e. print and edit/view (when editing // B2023-037: Handle <=, >=, +-, -> and <- symbols. Convert to unicode for output, i.e. print and edit/view (when editing
// step, will show as 2 characters, not unicode, unless ro inserted when code replaced link text with unicode. // step, will show as 2 characters, not unicode, unless ro inserted when code replaced link text with unicode.
public static string ROConvertSymbols(string retval) public static string ROConvertSymbols(string retval, bool arr1, bool arr2)
{ {
retval = retval.Replace("\\u8209?>", @"\u8594?"); // Right Arrow if (arr1)
retval = retval.Replace("<\\u8209?", @"\u8592?"); // Left Arrow {
retval = retval.Replace("->", @"\u8594?"); // Right Arrow retval = retval.Replace("\\u8209?>", @"\u8594?"); // Right Arrow
retval = retval.Replace("<-", @"\u8592?"); // Left Arrow retval = retval.Replace("<\\u8209?", @"\u8592?"); // Left Arrow
retval = retval.Replace("<=", @"\u8804?"); // Less than or Equal retval = retval.Replace("->", @"\u8594?"); // Right Arrow
retval = retval.Replace(">=", @"\u8805?"); // Greater than or Equal retval = retval.Replace("<-", @"\u8592?"); // Left Arrow
retval = retval.Replace("+\\u8209?", @"\'b1"); // plus minus }
retval = retval.Replace("+-", @"\'b1"); // plus minus if (arr2)
{
retval = retval.Replace("<=", @"\u8804?"); // Less than or Equal
retval = retval.Replace(">=", @"\u8805?"); // Greater than or Equal
retval = retval.Replace("+\\u8209?", @"\'b1"); // plus minus
retval = retval.Replace("+-", @"\'b1"); // plus minus
}
return retval; return retval;
} }
#endregion #endregion
@@ -484,7 +490,7 @@ namespace VEPROMS.CSLA.Library
return rc; return rc;
} }
public string GetTranslatedRoValue(string roid, bool DoCaret, bool DoDOSSuperSubScript, bool convertRoSymbols) public string GetTranslatedRoValue(string roid, bool DoCaret, bool DoDOSSuperSubScript, bool convertRoSymbols, ItemInfo myiteminfo)
{ {
roid = FormatRoidKey(roid, true); roid = FormatRoidKey(roid, true);
@@ -496,7 +502,13 @@ namespace VEPROMS.CSLA.Library
retval = ReplaceUnicode(retval, DoCaret); retval = ReplaceUnicode(retval, DoCaret);
// B2023-037: Handle <=, >=, +-, -> and <- symbols. Convert to unicode for output, i.e. print and edit/view (when editing // B2023-037: Handle <=, >=, +-, -> and <- symbols. Convert to unicode for output, i.e. print and edit/view (when editing
// step, will show as 2 characters, not unicode, unless ro inserted when code replaced link text with unicode. // step, will show as 2 characters, not unicode, unless ro inserted when code replaced link text with unicode.
if (convertRoSymbols) retval = ROFSTLookup.ROConvertSymbols(retval);
//(_MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue ||
// _MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue))
bool arrows1 = myiteminfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue;
bool arrows2 = myiteminfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue;
if (convertRoSymbols) retval = ROFSTLookup.ROConvertSymbols(retval, arrows1, arrows2);
retval = ConvertFortranFormatToScienctificNotation(retval); retval = ConvertFortranFormatToScienctificNotation(retval);

View File

@@ -1616,7 +1616,7 @@ namespace VEPROMS.CSLA.Library
foreach (ContentRoUsage ro in cont.ContentRoUsages) foreach (ContentRoUsage ro in cont.ContentRoUsages)
{ {
RoUsageInfo rou = RoUsageInfo.Get(ro.ROUsageID); RoUsageInfo rou = RoUsageInfo.Get(ro.ROUsageID);
string myvalue = mylookup.GetTranslatedRoValue(rou.ROID, tmp.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, tmp.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false); string myvalue = mylookup.GetTranslatedRoValue(rou.ROID, tmp.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, tmp.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false, tmp);
ROFSTLookup.rochild rocc = mylookup.GetRoChild(rou.ROID); ROFSTLookup.rochild rocc = mylookup.GetRoChild(rou.ROID);
@@ -1844,7 +1844,7 @@ namespace VEPROMS.CSLA.Library
ROFSTLookup mylookup = myRoFst.GetROFSTLookup(tmp.ContentItems[0].MyProcedure.MyDocVersion); ROFSTLookup mylookup = myRoFst.GetROFSTLookup(tmp.ContentItems[0].MyProcedure.MyDocVersion);
foreach (RoUsageInfo rou in tmp.ContentRoUsages) foreach (RoUsageInfo rou in tmp.ContentRoUsages)
{ {
string myvalue = mylookup.GetTranslatedRoValue(rou.ROID, tmp.ContentItems[0].ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, tmp.ContentItems[0].ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false); string myvalue = mylookup.GetTranslatedRoValue(rou.ROID, tmp.ContentItems[0].ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, tmp.ContentItems[0].ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false, tmp.ContentItems[0]);
ROFSTLookup.rochild rocc = mylookup.GetRoChild(rou.ROID); ROFSTLookup.rochild rocc = mylookup.GetRoChild(rou.ROID);
int mytype = rocc.type; int mytype = rocc.type;
ctmp.FixContentText(rou, myvalue, mytype, myRoFst); ctmp.FixContentText(rou, myvalue, mytype, myRoFst);

View File

@@ -468,10 +468,12 @@ namespace VEPROMS.CSLA.Library
return text; return text;
} }
// B2022-035: resolve unit specific designators - moved code to here so that other objects can use it // B2022-035: resolve unit specific designators - moved code to here so that other objects can use it
// B2024-025 added <ID> to the replace list
public static string ResolveUnitSpecific(DocVersionInfo mydocversion, string text) public static string ResolveUnitSpecific(DocVersionInfo mydocversion, string text)
{ {
if (mydocversion == null) return text; if (mydocversion == null) return text;
text = Regex.Replace(text, @"\<U\>", mydocversion.DocVersionConfig.Unit_Number, RegexOptions.IgnoreCase); text = Regex.Replace(text, @"\<U\>", mydocversion.DocVersionConfig.Unit_Number, RegexOptions.IgnoreCase);
text = Regex.Replace(text, @"\<ID\>", mydocversion.DocVersionConfig.Unit_ID, RegexOptions.IgnoreCase);
text = Regex.Replace(text, @"\<(U(-|\\u8209\?)ID)\>", mydocversion.DocVersionConfig.Unit_ID, RegexOptions.IgnoreCase); text = Regex.Replace(text, @"\<(U(-|\\u8209\?)ID)\>", mydocversion.DocVersionConfig.Unit_ID, RegexOptions.IgnoreCase);
text = Regex.Replace(text, @"\<(U(-|\\u8209\?)NAME)\>", mydocversion.DocVersionConfig.Unit_Name, RegexOptions.IgnoreCase); text = Regex.Replace(text, @"\<(U(-|\\u8209\?)NAME)\>", mydocversion.DocVersionConfig.Unit_Name, RegexOptions.IgnoreCase);
text = Regex.Replace(text, @"\<(U(-|\\u8209\?)TEXT)\>", mydocversion.DocVersionConfig.Unit_Text, RegexOptions.IgnoreCase); text = Regex.Replace(text, @"\<(U(-|\\u8209\?)TEXT)\>", mydocversion.DocVersionConfig.Unit_Text, RegexOptions.IgnoreCase);
@@ -694,10 +696,12 @@ namespace VEPROMS.CSLA.Library
// B2017-147: backquotes should be translated to degrees for edit/print: // B2017-147: backquotes should be translated to degrees for edit/print:
newvalue = newvalue.Replace("`", @"\'b0"); newvalue = newvalue.Replace("`", @"\'b0");
// B2023-037: Handle <=, >=, +-, -> and <- symbols. If the format has flags to convert these RO symbols, it // B2023-037: Handle <=, >=, +-, -> and <- symbols. If the format has flags to convert these RO symbols, it
bool arrows1 = _MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue;
bool arrows2 = _MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue;
// is done here so that output (print & edit/view) has symbol, not 2 characters. // is done here so that output (print & edit/view) has symbol, not 2 characters.
if (_MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue || if (!_MyItemInfo.IsTable && (_MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue ||
_MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue) _MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue))
newvalue = ROFSTLookup.ROConvertSymbols(newvalue); newvalue = ROFSTLookup.ROConvertSymbols(newvalue, arrows1, arrows2);
if (gg != newvalue) if (gg != newvalue)
text = text.Substring(0, myIndex) + newvalue + text.Substring(myIndex + myLength); text = text.Substring(0, myIndex) + newvalue + text.Substring(myIndex + myLength);

View File

@@ -908,7 +908,7 @@ namespace VEPROMS.CSLA.Library
{ {
string oldText = this.MyContent.Text; string oldText = this.MyContent.Text;
string roval = lookup.GetTranslatedRoValue(rousage.ROID, this.ActiveSection.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, this.ActiveSection.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false); string roval = lookup.GetTranslatedRoValue(rousage.ROID, this.ActiveSection.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, this.ActiveSection.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false, this);
ROFSTLookup.rochild roch = lookup.GetRoChild(rousage.ROID); ROFSTLookup.rochild roch = lookup.GetRoChild(rousage.ROID);
this.MyContent.FixContentText(rousage, roval, roch.type, rofstinfo, this); this.MyContent.FixContentText(rousage, roval, roch.type, rofstinfo, this);
@@ -964,7 +964,7 @@ namespace VEPROMS.CSLA.Library
ROCheckCount++; ROCheckCount++;
string oldText = itemInfo.MyContent.Text; string oldText = itemInfo.MyContent.Text;
string roval = lookup.GetTranslatedRoValue(rousage.ROID, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false); string roval = lookup.GetTranslatedRoValue(rousage.ROID, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false, sectionInfo);
ROFSTLookup.rochild roch = lookup.GetRoChild(rousage.ROID); ROFSTLookup.rochild roch = lookup.GetRoChild(rousage.ROID);
itemInfo.MyContent.FixContentText(rousage, roval, roch.type, origROFst, itemInfo); itemInfo.MyContent.FixContentText(rousage, roval, roch.type, origROFst, itemInfo);
@@ -1184,7 +1184,10 @@ namespace VEPROMS.CSLA.Library
if (sectionInfo != null) if (sectionInfo != null)
{ {
// B2023-037: loading print text, resolve the RO symbols // B2023-037: loading print text, resolve the RO symbols
string roval = lookup.GetTranslatedRoValue(rousage.ROID, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues,sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue|| sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue);
bool GTLT = !itemInfo.IsTable && sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue;
bool GLTArrows = !itemInfo.IsTable && sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue;
string roval = lookup.GetTranslatedRoValue(rousage.ROID, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, GTLT || GLTArrows, itemInfo);
ROFSTLookup.rochild roch = lookup.GetRoChild(rousage.ROID); ROFSTLookup.rochild roch = lookup.GetRoChild(rousage.ROID);
itemInfo.MyContent.FixContentText(rousage, roval, roch.type, rofstinfo, itemInfo); itemInfo.MyContent.FixContentText(rousage, roval, roch.type, rofstinfo, itemInfo);
} }
@@ -2931,8 +2934,22 @@ namespace VEPROMS.CSLA.Library
{ {
string str = MyContent.Text; string str = MyContent.Text;
// B2022-035: resolve unit specific designators // B2022-035: resolve unit specific designators
if (str.ToUpper().Contains(@"<U")) str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(this.MyDocVersion, str); // B2024-025 - process all of the applicability token (<U-xxx>, <U>, <ID>)
return ConvertToDisplayText(str, false); str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(this.MyDocVersion, str);
return ConvertToDisplayText(str, false, " "); // B2024-013 added " " to replace hard returns with a space instead of semi-colon
}
}
// B2024-013 added for Vogtle Units 3 & 4, used with {TOPSECTIONTITLE} pagelist item
// this will format the text and keep the hard return command
public string FormattedDisplayTextKeepHardReturn
{
get
{
string str = MyContent.Text;
// B2022-035: resolve unit specific designators
// B2024-025 - process all of the applicability token (<U-xxx>, <U>, <ID>)
str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(this.MyDocVersion, str);
return ConvertToDisplayText(str, false, ""); // pass in empty string for hard retun char will keep hard return
} }
} }
// Used in Comanche Peak EOP and Flex formats for step designators. Will allow a hard return to be used that that caution type. // Used in Comanche Peak EOP and Flex formats for step designators. Will allow a hard return to be used that that caution type.
@@ -2945,7 +2962,8 @@ namespace VEPROMS.CSLA.Library
string str = MyContent.Text; string str = MyContent.Text;
if (MyDocVersion != null) if (MyDocVersion != null)
{ {
str = Regex.Replace(str, @"\<[uU]\>", MyDocVersion.DocVersionConfig.Unit_Number); // B2024-025 - process all of the applicability token (<U-xxx>, <U>, <ID>)
str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(MyDocVersion, str);
} }
else else
{ {
@@ -2964,16 +2982,13 @@ namespace VEPROMS.CSLA.Library
if (MyDocVersion != null) if (MyDocVersion != null)
{ {
// B2022-035: resolve unit specific designators // B2022-035: resolve unit specific designators
if (str.ToUpper().Contains("<U")) str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(MyDocVersion, str); // B2024-025 - process all of the applicability token (<U-xxx>, <U>, <ID>)
str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(MyDocVersion, str);
} }
else else
{ {
_MyLog.WarnFormat("Disconnected Data - ItemID = {0}", ItemID); _MyLog.WarnFormat("Disconnected Data - ItemID = {0}", ItemID);
} }
//if (str.Contains("<u>"))
// str = str.Replace("<u>", MyDocVersion.DocVersionConfig.Unit_Number);
//if (str.Contains("<U>"))
// str = str.Replace("<U>", MyDocVersion.DocVersionConfig.Unit_Number);
return ConvertToDisplayText(str); return ConvertToDisplayText(str);
} }
} }
@@ -3032,7 +3047,8 @@ namespace VEPROMS.CSLA.Library
string str = MyContent.Text; string str = MyContent.Text;
if (MyDocVersion != null) if (MyDocVersion != null)
{ {
str = Regex.Replace(str, @"\<[uU]\>", MyDocVersion.DocVersionConfig.Unit_Number); // B2024-025 - process all of the applicability token (<U-xxx>, <U>, <ID>)
str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(MyDocVersion, str);
} }
else else
{ {
@@ -3065,8 +3081,8 @@ namespace VEPROMS.CSLA.Library
} }
else else
str = MyContent.Number; str = MyContent.Number;
str = Regex.Replace(str, @"\<U-ID\>", MyDocVersion.DocVersionConfig.Unit_ID, RegexOptions.IgnoreCase); // B2024-025 - process all of the applicability token (<U-xxx>, <U>, <ID>)
str = Regex.Replace(str, @"\<ID\>", MyDocVersion.DocVersionConfig.Unit_ID, RegexOptions.IgnoreCase); str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(MyDocVersion, str);
} }
else else
{ {
@@ -3079,7 +3095,9 @@ namespace VEPROMS.CSLA.Library
// str = str.Replace(@"<S\u8209?ID>", MyDocVersion.DocVersionConfig.Unit_ID); // str = str.Replace(@"<S\u8209?ID>", MyDocVersion.DocVersionConfig.Unit_ID);
str = ConvertToDisplayText(str); str = ConvertToDisplayText(str);
if (MyDocVersion != null) // B2020-086 check for null doc version - happens if item we are trying to open is no longer there (disconnected) if (MyDocVersion != null) // B2020-086 check for null doc version - happens if item we are trying to open is no longer there (disconnected)
str = Regex.Replace(str, @"\<[uU]\>", MyDocVersion.DocVersionConfig.Unit_Number); // B2017-019 - process "<u>" in section number // B2017-019 - process "<u>" in section number
// B2024-025 - process all of the applicability token (<U-xxx>, <U>, <ID>)
str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(MyDocVersion, str);
return str; return str;
} }
//get { return ConvertToDisplayText(MyContent.Number); } //get { return ConvertToDisplayText(MyContent.Number); }
@@ -3109,7 +3127,12 @@ namespace VEPROMS.CSLA.Library
return ConvertToDisplayText(txt, true); return ConvertToDisplayText(txt, true);
} }
public static string ConvertToDisplayText(string txt, bool stripRTF) // B2024-013 This allos us to control "what with" or "whether to" replace hard returns
// Semi-colons where printing on auto table of contents for section titles with hard returns
// added HardReturnChar string to parameter. The default is to use the semi-colon, for auto table of contents
// we replace it with a space, for Vogtle Unit 3 & 4 we retain the hard return when printing the section
public static string ConvertToDisplayText(string txt, bool stripRTF, string HardReturnChar = ";")
{ {
string retval = txt; string retval = txt;
@@ -3120,9 +3143,12 @@ namespace VEPROMS.CSLA.Library
retval = ReplaceSpecialCharacters(retval); retval = ReplaceSpecialCharacters(retval);
retval = retval.Replace("\u2011", "-"); retval = retval.Replace("\u2011", "-");
retval = retval.Replace("\u2572", @"\"); // replace backslash symbol with a backslash retval = retval.Replace("\u2572", @"\"); // replace backslash symbol with a backslash
retval = Regex.Replace(retval, @"\\line ?", ";"); // better handing of hard returns - replace with semi-colon for use on tree view if (HardReturnChar != "") // B2024-013 if a null string don't replace the hard return
retval = retval.Replace("\r\n", ";"); {
retval = retval.Replace("\n", ";"); //added for consistency checking with approved version retval = Regex.Replace(retval, @"\\line ?", HardReturnChar); // better handing of hard returns - replace with semi-colon for use on tree view
retval = retval.Replace("\r\n", HardReturnChar);
retval = retval.Replace("\n", HardReturnChar); //added for consistency checking with approved version
}
} }
return retval; return retval;
@@ -4420,7 +4446,7 @@ namespace VEPROMS.CSLA.Library
// F2018-025 Westinghouse when a high level step is used as a section number/title, // F2018-025 Westinghouse when a high level step is used as a section number/title,
// adjust the step/substep numbering where the first level substep uses the high level step tabbing format // adjust the step/substep numbering where the first level substep uses the high level step tabbing format
// and the following sub-substeps tabbing format are "shifted" accordingly (ex should look like ASS-101 Attachment 1 section 4 tabbing) // and the following sub-substeps tabbing format are "shifted" accordingly (ex should look like ASS-101 Attachment 1 section 4 tabbing)
if (!IsHigh && MyHLS != null && MyHLS.FormatStepData.AppendDotZero) if (!IsHigh && MyHLS != null && MyHLS.FormatStepData.AppendDotZero)
{ {
if (localPrintLevel > 1) if (localPrintLevel > 1)
{ {
@@ -4428,7 +4454,14 @@ namespace VEPROMS.CSLA.Library
itmp = (localPrintLevel + PrintBias + OffsetTab) % seqtabs.MaxIndex; itmp = (localPrintLevel + PrintBias + OffsetTab) % seqtabs.MaxIndex;
} }
} }
if (!tbformat.Contains(@"{!C")) // F2024-037 reset the seq sub-step numbering if the parent is an un-numbered high level step
// F2024-049 changed to specify the level via the format file (Generic EOP and Vogtle 3&4)
else if (sd.StepSectionLayoutData.ResetSeqNumberingAfterUnnumberedHLS != null && IsSequential && MyParent != null && MyParent.IsHigh && MyParent.MyTab.Text.Length == 0)
{
localPrintLevel = (int)sd.StepSectionLayoutData.ResetSeqNumberingAfterUnnumberedHLS;
itmp = (localPrintLevel + PrintBias + OffsetTab) % seqtabs.MaxIndex;
}
if (!tbformat.Contains(@"{!C"))
tbformat = seqtabs[itmp].PrintTabFormat; // seqtab in 16bit, i.e. '. or )' etc. tbformat = seqtabs[itmp].PrintTabFormat; // seqtab in 16bit, i.e. '. or )' etc.
else else
tbformat = tbformat.Replace("{seq}", seqtabs[itmp].PrintTabFormat); tbformat = tbformat.Replace("{seq}", seqtabs[itmp].PrintTabFormat);
@@ -4536,6 +4569,7 @@ namespace VEPROMS.CSLA.Library
} }
bool isAlpha = tbformat.ToUpper().Contains("ALPHA"); bool isAlpha = tbformat.ToUpper().Contains("ALPHA");
int ordinal = Ordinal; int ordinal = Ordinal;
bool trimSeqValue = FormatStepData.TabData.TrimSeqTabValue; // F2024-043 remove space around SEQ tab value
bool useLinked = false; // if this is enhanced, and the LinkedTab isn't numeric, flag to use 'LinkedTab' for the tab. bool useLinked = false; // if this is enhanced, and the LinkedTab isn't numeric, flag to use 'LinkedTab' for the tab.
if (ActiveSection != null && ActiveSection.IsEnhancedSection) // C2018-003 fixed use of getting the active section if (ActiveSection != null && ActiveSection.IsEnhancedSection) // C2018-003 fixed use of getting the active section
{ {
@@ -4567,6 +4601,7 @@ namespace VEPROMS.CSLA.Library
tbformat = tbformat.Replace("{numeric}", LinkedTab.Trim(" .".ToCharArray()).PadLeft(2)); tbformat = tbformat.Replace("{numeric}", LinkedTab.Trim(" .".ToCharArray()).PadLeft(2));
} }
string alpha = useLinked?LinkedTab.Trim():AlphabeticalNumbering(ordinal); string alpha = useLinked?LinkedTab.Trim():AlphabeticalNumbering(ordinal);
if (trimSeqValue) alpha = alpha.Trim(); // F2024-043 trim white around SEQ tab value (for sub-steps)
// B2017-211 Roman High Level steps should be followed by Uppercase alpha substeps - This is being limited to Calvert SAMG Format // B2017-211 Roman High Level steps should be followed by Uppercase alpha substeps - This is being limited to Calvert SAMG Format
if (_ActiveFormat.Name =="BGESAM1" &&MyParent != null && MyParent.IsHigh && MyParent.IsStep && MyParent.FormatStepData.TabData.IdentEdit.Contains("ROMAN")) if (_ActiveFormat.Name =="BGESAM1" &&MyParent != null && MyParent.IsHigh && MyParent.IsStep && MyParent.FormatStepData.TabData.IdentEdit.Contains("ROMAN"))
tbformat = tbformat.Replace("{alpha}", alpha); tbformat = tbformat.Replace("{alpha}", alpha);
@@ -4609,7 +4644,8 @@ namespace VEPROMS.CSLA.Library
tbformat = tbformat.Replace("{numeric}", stpTab); tbformat = tbformat.Replace("{numeric}", stpTab);
} }
else else
tbformat = tbformat.Replace("{numeric}", trimTabStart ? ordinal.ToString() : FormatStepData.AtLeastTwoDigits ? ordinal.ToString().PadLeft(2, '0') : ordinal.ToString().PadLeft(2)); // F2024-043 added trimSeqValue to trim white around SEQ tab value (for sub-steps)
tbformat = tbformat.Replace("{numeric}", (trimTabStart || trimSeqValue) ? ordinal.ToString() : FormatStepData.AtLeastTwoDigits ? ordinal.ToString().PadLeft(2, '0') : ordinal.ToString().PadLeft(2));
if (tbformate != null) if (tbformate != null)
{ {
if (useLinked) if (useLinked)

View File

@@ -1309,7 +1309,8 @@ namespace VEPROMS.CSLA.Library
else if (addType == EAddpingPart.Replace) // what about user interface for enhanced pasted steps? else if (addType == EAddpingPart.Replace) // what about user interface for enhanced pasted steps?
{ {
ItemInfo enhReplaceItem = ItemInfo.Get(edSource.ItemID); ItemInfo enhReplaceItem = ItemInfo.Get(edSource.ItemID);
newEnhancedItemInfo = Item.PasteReplace(enhReplaceItem, tmpCopyEnhancedID, chgid); TreeNode trn = null;
newEnhancedItemInfo = Item.PasteReplace(enhReplaceItem, tmpCopyEnhancedID, chgid, trn);
} }
// update the config data for the new enhanced item (procedure, section or step) to point back to the correct source // update the config data for the new enhanced item (procedure, section or step) to point back to the correct source
@@ -2497,13 +2498,16 @@ namespace VEPROMS.CSLA.Library
} }
#endregion #endregion
#region PasteReplace #region PasteReplace
public static ItemInfo PasteReplace(ItemInfo itemInfo, int copyStartID, string chgid)
public static ItemInfo PasteReplace(ItemInfo itemInfo, int copyStartID, string chgid, TreeNode treeNodeReplace)
{ {
bool tmp= false; bool tmp = false;
return PasteReplace(itemInfo, copyStartID, chgid, ref tmp); return PasteReplace(itemInfo, copyStartID, chgid, treeNodeReplace, ref tmp);
} }
// B2017-179 return a bool (firstTrans) if we could not replace the step but the user wants to position to the first transition that needs resolved // B2017-179 return a bool (firstTrans) if we could not replace the step but the user wants to position to the first transition that needs resolved
public static ItemInfo PasteReplace(ItemInfo itemInfo, int copyStartID, string chgid, ref bool firstTrans) public static ItemInfo PasteReplace(ItemInfo itemInfo, int copyStartID, string chgid, TreeNode treeNodeReplace, ref bool firstTrans)
{ {
firstTrans = false; firstTrans = false;
if (!CanDeleteObject()) if (!CanDeleteObject())
@@ -2560,7 +2564,14 @@ namespace VEPROMS.CSLA.Library
} }
else else
{ {
newItemInfo.MyParent.OnNewChild(new ItemInfoInsertEventArgs(newItemInfo, ItemInfo.EAddpingPart.Child)); //Create tree node for copied procedure when no other procedures exist in the folder
VETreeNode vtn = treeNodeReplace as VETreeNode;
DocVersionInfo dvi = vtn.VEObject as DocVersionInfo;
ItemInfo newProc = dvi.PasteChild(copyStartID);
VETreeNode tn1 = new VETreeNode(newProc);
treeNodeReplace.Nodes.Add(tn1); // add tree node to end of list.
treeNodeReplace = tn1;
} }
return newItemInfo; return newItemInfo;
} }

View File

@@ -722,7 +722,7 @@ namespace VEPROMS.CSLA.Library
{ {
foreach (ItemInfo ii in roUsg.MyContent.ContentItems) foreach (ItemInfo ii in roUsg.MyContent.ContentItems)
{ {
string val = newLookup.GetTranslatedRoValue(padroid, ii.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, ii.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false); string val = newLookup.GetTranslatedRoValue(padroid, ii.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, ii.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false, ii);
content.FixContentText(roUsg, val, roch.type, origROFstInfo, true); content.FixContentText(roUsg, val, roch.type, origROFstInfo, true);
if (content.IsDirty) if (content.IsDirty)

View File

@@ -978,7 +978,8 @@ namespace VEPROMS.CSLA.Library
retstr = unitnum.Replace("#", retstr); retstr = unitnum.Replace("#", retstr);
} }
// B2022-004: Remove Proc PC/PC token from transition text. // B2022-004: Remove Proc PC/PC token from transition text.
if (tb._FromItem.ActiveFormat != null && tb._FromItem.ActiveFormat.PlantFormat.FormatData.TransData.ProcLevelPCPC && retstr.ToUpper().StartsWith("<U")) // F2024-030 for Vogtle Units 3 & 4, added KeepOnePCPCTag flag to keep one of the PC/PC tokens when editing
if (tb._FromItem.ActiveFormat != null && !tb._FromItem.ActiveFormat.PlantFormat.FormatData.TransData.KeepOnePCPCTag && tb._FromItem.ActiveFormat.PlantFormat.FormatData.TransData.ProcLevelPCPC && retstr.ToUpper().StartsWith("<U"))
{ {
int indx = retstr.IndexOf(">"); int indx = retstr.IndexOf(">");
retstr = retstr.Substring(indx + 1); retstr = retstr.Substring(indx + 1);
@@ -1226,7 +1227,10 @@ namespace VEPROMS.CSLA.Library
case 0: case 0:
break; break;
default: default:
tb.Append(string.Format(" (Page {0})", tb._ToItem.PageNumber + 1)); //F2024-048 use a hard space (\\u160;) instead of a space in the page number text
// to keep that text together on the page
//B2024-026: hard space unicode ends with '?' not ';'
tb.Append(string.Format(" (Page{0}{1})", "\\u160?", tb._ToItem.PageNumber + 1));
break; break;
} }
} }
@@ -1537,8 +1541,8 @@ namespace VEPROMS.CSLA.Library
ItemInfo tmpitm = TranGetSectionItem(itminfo); ItemInfo tmpitm = TranGetSectionItem(itminfo);
if (!tmpitm.IsSection) return ""; if (!tmpitm.IsSection) return "";
string str = tmpitm.MyContent.Number; string str = tmpitm.MyContent.Number;
str = Regex.Replace(str, @"\<U\>", itminfo.MyDocVersion.DocVersionConfig.Unit_Number, RegexOptions.IgnoreCase ); // B2024-025 - process all of the applicability token (<U-xxx>, <U>, <ID>)
str = Regex.Replace(str, @"\<ID\>", itminfo.MyDocVersion.DocVersionConfig.Unit_ID, RegexOptions.IgnoreCase); str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(itminfo.MyDocVersion, str);
return (str); return (str);
} }
private static string TranGetSectionNumber(TransitionBuilder tb, bool allLevels) private static string TranGetSectionNumber(TransitionBuilder tb, bool allLevels)
@@ -1563,8 +1567,8 @@ namespace VEPROMS.CSLA.Library
} }
//string str = tmpitm.MyContent.Number; //string str = tmpitm.MyContent.Number;
string str = BuildSectionPath(ToSections); string str = BuildSectionPath(ToSections);
str = Regex.Replace(str, @"\<U\>", tb._ToItem.MyDocVersion.DocVersionConfig.Unit_Number, RegexOptions.IgnoreCase); // B2024-025 - process all of the applicability token (<U-xxx>, <U>, <ID>)
str = Regex.Replace(str, @"\<ID\>", tb._ToItem.MyDocVersion.DocVersionConfig.Unit_ID, RegexOptions.IgnoreCase); str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(tb._ToItem.MyDocVersion, str);
//if (!str.EndsWith(".") && tb._ToItem.ItemID != tb._ToItem.ActiveSection.ItemID) //if (!str.EndsWith(".") && tb._ToItem.ItemID != tb._ToItem.ActiveSection.ItemID)
tb.StepPrefix = "."; tb.StepPrefix = ".";
tb.SectionNumberLength = str.Length; tb.SectionNumberLength = str.Length;

View File

@@ -58,7 +58,8 @@ namespace VEPROMS.CSLA.Library
SectMenuStep = 0x0020, SectMenuStep = 0x0020,
StepAllowNone = 0x0040, StepAllowNone = 0x0040,
StepFirst = 0x0080, StepFirst = 0x0080,
StepLast = 0x0100 StepLast = 0x0100,
StepAllChildren = 0x0200
} }
public enum E_EMode : uint public enum E_EMode : uint
{ {

View File

@@ -4508,6 +4508,15 @@ namespace VEPROMS.CSLA.Library
return LazyLoad(ref _AllowNoteCautionAdd, "@AllowNoteCautionAdd"); return LazyLoad(ref _AllowNoteCautionAdd, "@AllowNoteCautionAdd");
} }
} }
// F2024-049 changed to specify the sub-step level via the format file (Generic EOP and Vogtle 3&4)
private LazyLoad<int?> _ResetSeqNumberingAfterUnnumberedHLS;
public int? ResetSeqNumberingAfterUnnumberedHLS
{
get
{
return LazyLoad(ref _ResetSeqNumberingAfterUnnumberedHLS, "@ResetSeqNumberingAfterUnnumberedHLS");
}
}
} }
#endregion #endregion
#region TopOfPage #region TopOfPage
@@ -6635,6 +6644,17 @@ namespace VEPROMS.CSLA.Library
return LazyLoad(ref _UseEntireSectionNum, "TabData/@UseEntireSectionNum"); return LazyLoad(ref _UseEntireSectionNum, "TabData/@UseEntireSectionNum");
} }
} }
// this will remove white space before/after the tab value
// put in for Vogtal Units 3 & 4 formats for continuous action sub-steps
// they have tab value within parenthesis and for a single digit/letter we don't want the white steps before or after it
private LazyLoad<bool> _TrimSeqTabValue;
public bool TrimSeqTabValue
{
get
{
return LazyLoad(ref _TrimSeqTabValue, "TabData/@TrimSeqTabValue");
}
}
} }
#endregion #endregion
@@ -7260,6 +7280,15 @@ namespace VEPROMS.CSLA.Library
return LazyLoad(ref _ProcLevelPCPC, "@ProcLevelPCPC"); return LazyLoad(ref _ProcLevelPCPC, "@ProcLevelPCPC");
} }
} }
// F2024-030 for Vogtle Units 3 & 4, added KeepOnePCPCTag flag to keep one of the PC/PC tokens when editing
private LazyLoad<bool> _KeepOnePCPCTag;
public bool KeepOnePCPCTag
{
get
{
return LazyLoad(ref _KeepOnePCPCTag, "@KeepOnePCPCTag");
}
}
} }
#endregion #endregion
#region TransType #region TransType

View File

@@ -199,9 +199,12 @@ namespace VEPROMS.CSLA.Library
LoadChildren(true); LoadChildren(true);
} }
private bool _allParts = true; private bool _allParts = true;
public virtual void LoadChildren(bool allParts) private bool _excludeTablesFigsEqu = false; // used for inserting Step Text transitions (BNPP)
public virtual void LoadChildren(bool allParts, bool excldTablesFigEq = false)
{ {
_allParts = allParts; _allParts = allParts;
// B2024-019 don't show Tables, Figures, or Equations in step tree when inserting Text Transitions
_excludeTablesFigsEqu = excldTablesFigEq;
if (!_ChildrenLoaded) if (!_ChildrenLoaded)
{ {
this.Nodes.Clear(); this.Nodes.Clear();
@@ -262,6 +265,10 @@ namespace VEPROMS.CSLA.Library
if (!skipIt) if (!skipIt)
{ {
VETreeNode tmp = new VETreeNode(o, _allParts); VETreeNode tmp = new VETreeNode(o, _allParts);
// B2024-019 don't show Tables, Figures, or Equations in step tree when inserting Text Transitions
bool isTableFigEqu = tmp.Text.Equals("Table") ||
tmp.Text.Equals("Figure") ||
tmp.Text.Equals("Equation");
if (o.HasChildren) if (o.HasChildren)
{ {
if (o is PartInfo) if (o is PartInfo)
@@ -279,7 +286,8 @@ namespace VEPROMS.CSLA.Library
tmp._ChildrenLoaded = true;// Reset the children loaded flag tmp._ChildrenLoaded = true;// Reset the children loaded flag
if (lastWasSection) if (lastWasSection)
this.Nodes.Insert(0, tmp); this.Nodes.Insert(0, tmp);
else // B2024-019 don't show Tables, Figures, or Equations in step tree when inserting Text Transitions
else if (!_excludeTablesFigsEqu || !isTableFigEqu)
this.Nodes.Add(tmp); this.Nodes.Add(tmp);
// if last thing was section & this is step, do insert - i.e. so that steps go before sections. // if last thing was section & this is step, do insert - i.e. so that steps go before sections.
lastWasSection = (o is PartInfo && (o as PartInfo).PartType == E_FromType.Section); lastWasSection = (o is PartInfo && (o as PartInfo).PartType == E_FromType.Section);

View File

@@ -18,7 +18,7 @@
</SccAuxPath> </SccAuxPath>
<SccProvider> <SccProvider>
</SccProvider> </SccProvider>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<FileUpgradeFlags> <FileUpgradeFlags>
</FileUpgradeFlags> </FileUpgradeFlags>
<UpgradeBackupLocation> <UpgradeBackupLocation>
@@ -83,8 +83,7 @@
<Prefer32Bit>false</Prefer32Bit> <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Csla, Version=2.1.4.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL"> <Reference Include="Csla">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll</HintPath> <HintPath>..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll</HintPath>
</Reference> </Reference>
<Reference Include="DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL"> <Reference Include="DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL">

View File

@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.Serialization.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Extensions.DependencyInjection" publicKeyToken="adb9793829ddae60" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

View File

@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Bcl.AsyncInterfaces" version="5.0.0" targetFramework="net462" />
<package id="Microsoft.Extensions.Configuration" version="5.0.0" targetFramework="net462" />
<package id="Microsoft.Extensions.Configuration.Abstractions" version="5.0.0" targetFramework="net462" />
<package id="Microsoft.Extensions.Configuration.Binder" version="5.0.0" targetFramework="net462" />
<package id="Microsoft.Extensions.DependencyInjection" version="5.0.0" targetFramework="net462" />
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="5.0.0" targetFramework="net462" />
<package id="Microsoft.Extensions.Primitives" version="5.0.0" targetFramework="net462" />
<package id="System.Buffers" version="4.5.1" targetFramework="net462" />
<package id="System.ComponentModel" version="4.3.0" targetFramework="net462" />
<package id="System.ComponentModel.Annotations" version="4.7.0" targetFramework="net462" />
<package id="System.ComponentModel.Primitives" version="4.3.0" targetFramework="net462" />
<package id="System.Data.Common" version="4.3.0" targetFramework="net462" />
<package id="System.Memory" version="4.5.4" targetFramework="net462" />
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net462" />
<package id="System.Reflection" version="4.3.0" targetFramework="net462" />
<package id="System.Runtime.CompilerServices.Unsafe" version="5.0.0" targetFramework="net462" />
<package id="System.Runtime.Serialization.Formatters" version="4.3.0" targetFramework="net462" />
<package id="System.Runtime.Serialization.Primitives" version="4.3.0" targetFramework="net462" />
<package id="System.Runtime.Serialization.Xml" version="4.3.0" targetFramework="net462" />
<package id="System.Security.Principal" version="4.3.0" targetFramework="net462" />
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net462" />
<package id="System.Threading.ThreadPool" version="4.3.0" targetFramework="net462" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
</packages>

Some files were not shown because too many files have changed in this diff Show More