Compare commits

..

16 Commits

Author SHA1 Message Date
mschill aa7e0528f8 Merge branch 'Development' into B2026-053-Find-Unlinked-Values-of-Selected 2026-07-28 06:34:08 -04:00
plarsen 57bd8d569e B2026-053-Find-Unlinked-Values-of-Selected 2026-07-27 13:45:20 -04:00
plarsen b49d8871a2 B2026-053-Find-Unlinked-Values-of-Selected 2026-07-27 12:25:46 -04:00
plarsen b90d419bc5 B2026-053-Find-Unlinked-Values-of-Selected 2026-07-27 12:14:55 -04:00
jjenko 1f48d498e1 Merge pull request 'B2026-067 – Corrected specific instance where a crash would occur when multiple Word Sections open and were closed in a specific order.' (#797) from B2026-067 into Development
good for testing
2026-07-27 11:54:21 -04:00
mschill da6139c932 B2026-067 – Corrected specific instance where a crash would occur when multiple Word Sections open and were closed in a specific order. 2026-07-27 11:47:36 -04:00
plarsen be744b40a3 B2026-053-Find-Unlinked-Values-of-Selected 2026-07-27 11:35:42 -04:00
plarsen 780ce657ca B2026-053-Find-Unlinked-Values-of-Selected 2026-07-27 11:28:40 -04:00
plarsen 464be0f803 B2026-053-Find-Unlinked-Values-of-Selected 2026-07-27 11:22:49 -04:00
plarsen 58a6cb9a24 Development 2026-07-27 11:19:47 -04:00
plarsen 9bf7b2ffde B2026-053-Find-Unlinked-Values-of-Selected 2026-07-27 11:14:19 -04:00
mschill cde1f28215 Merge pull request 'B2026-066 Fixed issue of the Update RO Values button and Working Draft context menu item, not being disabled after Updating RO Values.' (#796) from B2026-066_UpdateROsButtonFix into Development
Looks Good. Ready for QA.
2026-07-27 11:09:42 -04:00
jjenko db198cb7d0 B2026-066 Fixed issue of the Update RO Values button and Working Draft context menu item, not being disabled after Updating RO Values. 2026-07-27 11:08:35 -04:00
plarsen 2261c8f0f5 B2026-053-Find-Unlinked-Values-of-Selected 2026-07-24 10:47:25 -04:00
plarsen f93b16fc52 B2026-053-Find-Unlinked-Values-of-Selected 2026-07-23 09:21:09 -04:00
plarsen 7c3a43749c B2026-053-Find-Unlinked-Values-of-Selected 2026-07-23 09:09:22 -04:00
7 changed files with 32 additions and 47 deletions
+1 -1
View File
@@ -2148,7 +2148,7 @@ namespace VEPROMS
//C2019-036 View Only mode work with Checked Out Procedures //C2019-036 View Only mode work with Checked Out Procedures
// View Only Mode is no longer checked out, so no longer has an OwnerID // View Only Mode is no longer checked out, so no longer has an OwnerID
// This will keep those tabs from auto-closing based on the timer // This will keep those tabs from auto-closing based on the timer
if (!myList.Contains(dti.OwnerID) && dti.MyStepTabPanel.MyStepPanel.VwMode != E_ViewMode.View) if (!myList.Contains(dti.OwnerID) && dti?.MyStepTabPanel?.MyStepPanel?.VwMode != E_ViewMode.View)
{ {
MyCloseTabList.PushDTI(dti); MyCloseTabList.PushDTI(dti);
} }
@@ -7279,7 +7279,6 @@ namespace VEPROMS.CSLA.Library
_ByWordSuffix = byWordSuffix; _ByWordSuffix = byWordSuffix;
} }
} }
private void DataPortal_Fetch(ItemListSearchCriteria criteria) private void DataPortal_Fetch(ItemListSearchCriteria criteria)
{ {
this.RaiseListChangedEvents = false; this.RaiseListChangedEvents = false;
@@ -262,8 +262,10 @@ namespace VEPROMS.CSLA.Library
if (dvi.DocVersionAssociations[0].MyROFst.ROFstID != newfstid) if (dvi.DocVersionAssociations[0].MyROFst.ROFstID != newfstid)
{ {
dv.DocVersionAssociations[0].MyROFst = localROFst.GetJustROFst(); dv.DocVersionAssociations[0].MyROFst = localROFst.GetJustROFst();
SetAssociationLastCompleted(dv, DateTime.Now.ToString());
} }
// B2026-066 moved this out of if statement above
// - was not resetting the datetime and thus not disabling the Update RO Values button and menu item
SetAssociationLastCompleted(dv, DateTime.Now.ToString());
} }
} }
+9 -1
View File
@@ -613,7 +613,15 @@ namespace Volian.Controls.Library
_In_DSOTabPanel_Enter = false; _In_DSOTabPanel_Enter = false;
_MyDisplayTabControl.SelectedDisplayTabItem = MyDisplayTabItem; _MyDisplayTabControl.SelectedDisplayTabItem = MyDisplayTabItem;
// B2018-070 Position the text cursor - Activate MS Word Panel // B2018-070 Position the text cursor - Activate MS Word Panel
_MyEdWord.GotoItem(EDWordLib.WdGoToItem.wdGoToObject, EDWordLib.WdGoToDirection.wdGoToNext, 0, null); try
{
_MyEdWord.GotoItem(EDWordLib.WdGoToItem.wdGoToObject, EDWordLib.WdGoToDirection.wdGoToNext, 0, null);
}
catch
{
//B2026-067 - Do nothing if cannot Position cursor
}
} }
#endregion #endregion
#region Public Methods #region Public Methods
@@ -2078,8 +2078,8 @@ namespace Volian.Controls.Library
if (cbxFndUnLnkROVals.Enabled && cbxFndUnLnkROVals.Checked) if (cbxFndUnLnkROVals.Enabled && cbxFndUnLnkROVals.Checked)
{ {
string ROSearchList2 = exactsearch(ROSearchList); // match exact string string ROSearchList2 = exactsearch(ROSearchList); // B2026-053 match exact string
// B2022-031 - added a cbxProcSectSrch to filter out procedure and section titles from global search results. // B2022-031 - added a exactsearch to filter out procedure and section titles from global search results.
SearchResults = ItemInfoList.GetListFromTextSearch(DVISearchList, TypeSearchList, ROSearchList2, cbxBooleanTxtSrch.Checked ? 2 : cbxCaseSensitive.Checked ? 1 : 0, cbxProcSectSrch.Checked ? 1 : 0, ItemSearchIncludeLinks.Nothing, includeRTFformat, includeSpecialChars, unitPrefix, string.Empty, string.Empty); SearchResults = ItemInfoList.GetListFromTextSearch(DVISearchList, TypeSearchList, ROSearchList2, cbxBooleanTxtSrch.Checked ? 2 : cbxCaseSensitive.Checked ? 1 : 0, cbxProcSectSrch.Checked ? 1 : 0, ItemSearchIncludeLinks.Nothing, includeRTFformat, includeSpecialChars, unitPrefix, string.Empty, string.Empty);
cmbResultsStyleIndex = 3; // display step text in results cmbResultsStyleIndex = 3; // display step text in results
} }
@@ -2193,7 +2193,6 @@ namespace Volian.Controls.Library
private string exactsearch(string SearchString) // B2026-053 private string exactsearch(string SearchString) // B2026-053
{ {
//string ss = "";
StringBuilder ss = new StringBuilder(); StringBuilder ss = new StringBuilder();
int sl = SearchString.Length; int sl = SearchString.Length;
int LstIdxSp = SearchString.LastIndexOf(' '); int LstIdxSp = SearchString.LastIndexOf(' ');
@@ -2206,7 +2205,7 @@ namespace Volian.Controls.Library
{ {
ss.Append(' '); ss.Append(' ');
ss.Append(SearchString); // B2026-053 Exact match add spaces before and after searchString. ss.Append(SearchString); // B2026-053 Exact match add spaces before and after searchString.
ss.Append(' '); ss.Append(' ');
} }
return ss.ToString(); return ss.ToString();
} }
+1 -6
View File
@@ -1,5 +1,4 @@
using System; using System;
using System.Windows.Forms;
namespace Volian.Controls.Library namespace Volian.Controls.Library
{ {
@@ -79,15 +78,11 @@ namespace Volian.Controls.Library
// VlnFlexGrid // VlnFlexGrid
// //
this.Rows.DefaultSize = 19; this.Rows.DefaultSize = 19;
this.AllowDrop = true;
this.DragEnter += new DragEventHandler(Control_DragEnter);
this.DragDrop += new DragEventHandler(Control_DragDrop);
((System.ComponentModel.ISupportInitialize)(this)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
this.ResumeLayout(false); this.ResumeLayout(false);
} }
#endregion #endregion
} }
} }
+15 -33
View File
@@ -1,23 +1,22 @@
using C1.Win.C1FlexGrid;
using C1.Win.C1SpellChecker;
using DevComponents.DotNetBar.Controls;
using JR.Utils.GUI.Forms;
using System; using System;
using System.ComponentModel;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics; using System.Diagnostics;
using System.Drawing;
using System.IO;
using System.Runtime.InteropServices;
using System.Text; using System.Text;
using System.Text.RegularExpressions;
using System.Windows.Forms; using System.Windows.Forms;
using System.Drawing;
using System.Runtime.InteropServices;
using System.Xml; using System.Xml;
using System.Xml.Serialization; using System.IO;
using VEPROMS.CSLA.Library;
using Volian.Base.Library;
using Volian.Controls.Library; using Volian.Controls.Library;
using VEPROMS.CSLA.Library;
using C1.Win.C1FlexGrid;
using C1.Win.C1SpellChecker;
using System.Text.RegularExpressions;
using System.Xml.Serialization;
using Volian.Base.Library;
using JR.Utils.GUI.Forms;
namespace Volian.Controls.Library namespace Volian.Controls.Library
{ {
@@ -4439,28 +4438,11 @@ namespace Volian.Controls.Library
// } // }
//} //}
private void Control_DragEnter(object sender, DragEventArgs e)
{
if (e.Data.GetDataPresent(DataFormats.Text))
{
e.Effect = DragDropEffects.Copy; // Allow copy
}
else
{
e.Effect = DragDropEffects.None; // Disallow
}
}
private void Control_DragDrop(object sender, DragEventArgs e)
{
string data = (string)e.Data.GetData(DataFormats.Text);
// Process the data (e.g., display it in a TextBox)
this.Text = data;
}
#region Uneven Selections #region Uneven Selections
/// <summary> /// <summary>
/// True if the top and bottom row of the selection is the same for every column /// True if the top and bottom row of the selection is the same for every column
/// </summary> /// </summary>
public bool EvenSelection public bool EvenSelection
{ {
get get
{ {