Przeglądaj źródła

Merge remote-tracking branch 'origin/nick' into frank

Frank van den Bos 2 lat temu
rodzic
commit
52c13ec173

+ 1 - 1
prs.classes/Entities/Kanban/Kanban.cs

@@ -69,7 +69,7 @@ namespace Comal.Classes
         [EditorSequence(3)]
         public string[] Notes { get; set; }
 
-        [NullEditor]
+        [MemoEditor(Visible = Visible.Optional, Editable = Editable.Disabled)]
         [EditorSequence(4)]
         public string Summary { get; set; }
 

+ 4 - 3
prs.desktop/Grids/KanbanGrid.cs

@@ -9,7 +9,6 @@ using InABox.Clients;
 using InABox.Core;
 using InABox.DynamicGrid;
 using InABox.WPF;
-using NPOI.SS.Formula.Functions;
 
 namespace PRSDesktop
 {
@@ -24,8 +23,7 @@ namespace PRSDesktop
             HiddenColumns.Add(x => x.ManagerLink.Deleted);
 
             Options.Add(DynamicGridOption.SelectColumns);
-            Options.Add(DynamicGridOption.FilterRows);
-            
+            Options.Add(DynamicGridOption.FilterRows);           
 
             OnCustomiseEditor += CustomiseEditor;
             OnBeforeSave += BeforeSave;
@@ -215,6 +213,9 @@ namespace PRSDesktop
         {
             if (Host.ParentID != Guid.Empty)
                 criteria.Add(new Filter<Kanban>(x => x.JobLink.ID).IsEqualTo(Host.ParentID));
+
+            criteria.Add(new Filter<Kanban>(x => x.Created).IsGreaterThanOrEqualTo(DateTime.Now.AddDays(-365)));
+
             base.Reload(criteria, columns, ref sort, action);
         }
 

+ 2 - 1
prs.desktop/Panels/Tasks/TaskPanel.xaml.cs

@@ -17,6 +17,7 @@ using Syncfusion.Pdf;
 using System.Windows.Data;
 using System.Windows.Media;
 using System.Drawing;
+using System.Globalization;
 
 namespace PRSDesktop
 {
@@ -134,7 +135,7 @@ namespace PRSDesktop
         /// <param name="menu"></param>
         public void PopulateMenu(ITaskControl control, ContextMenu menu)
         {
-            menu.Items.Clear();
+           menu.Items.Clear();
             
             var models = control.SelectedModels((menu.Tag as TaskModel)!).ToArray();
             var references = GetReferences(models);

+ 1 - 1
prs.desktop/prsdesktop.iss

@@ -5,7 +5,7 @@
 #pragma verboselevel 9
 
 #define MyAppName "PRS Desktop"
-#define MyAppVersion "7.08b"
+#define MyAppVersion "7.08c"
 #define MyAppPublisher "PRS Digital"
 #define MyAppURL "https://www.prs-software.com.au"
 #define MyAppExeName "PRSDesktop.exe"

+ 0 - 1
prs.mobile/comal.timesheets/DigitalForms/Renderer/QAFormViewer.cs

@@ -13,7 +13,6 @@ using Syncfusion.XForms.SignaturePad;
 using comal.timesheets.Tasks;
 using Comal.Classes;
 using PRSClasses;
-using Org.BouncyCastle.Utilities;
 
 namespace comal.timesheets.QAForms
 {

+ 1 - 1
prs.mobile/comal.timesheets/Main/Settings.xaml.cs

@@ -365,7 +365,7 @@ namespace comal.timesheets
                 {
                     Subject = "Error Logs from " + GlobalVariables.EmpName,
                     Body = errorText,
-                    To = new List<string> { "nick@prsdigital.com.au" }
+                    To = new List<string> { "support@prsdigital.com.au" }
                 };
 
                 await Email.ComposeAsync(message);

+ 1 - 1
prs.server/PRSServer.iss

@@ -5,7 +5,7 @@
 #pragma verboselevel 9
 
 #define MyAppName "PRS Server"
-#define MyAppVersion "7.08b"
+#define MyAppVersion "7.08c"
 #define MyAppPublisher "PRS Digital"
 #define MyAppURL "https://www.prs-software.com.au"
 #define MyAppExeName "PRSServer.exe"