Просмотр исходного кода

Added a data entry panel to PRS Desktop; Changed all references to DynamicEditorForm to IDynamicEditorForm

Kenric Nugteren 2 лет назад
Родитель
Сommit
03ac894bb3

+ 1 - 1
prs.desktop/Configuration/ManufacturingTemplateGrid.cs

@@ -33,7 +33,7 @@ namespace PRSDesktop
             base.Reload(criteria, columns, ref sort, action);
         }
 
-        protected override Dictionary<string, object> EditorValueChanged(DynamicEditorForm editor, ManufacturingTemplate[] items, string name,
+        protected override Dictionary<string, object> EditorValueChanged(IDynamicEditorForm editor, ManufacturingTemplate[] items, string name,
             object value)
         {
             var result = base.EditorValueChanged(editor, items, name, value);

+ 1 - 1
prs.desktop/Dashboards/Projects/Job Requisition Items Review Dashboard/JobRequisitionReviewDashboard.xaml.cs

@@ -469,7 +469,7 @@ namespace PRSDesktop
             return page.EditItems(new[] { purchaseOrder }, LoadPurchaseOrderItems, true);
         }
 
-        private void PurchaseOrderOnSave(DynamicEditorForm form, PurchaseOrder[] items)
+        private void PurchaseOrderOnSave(IDynamicEditorForm form, PurchaseOrder[] items)
         {
             Progress.Show("Working");
 

+ 2 - 2
prs.desktop/Forms/AssignmentView.xaml.cs

@@ -1166,9 +1166,9 @@ namespace PRSDesktop
             }
         }
 
-        protected Dictionary<string, object> EditorValueChanged(object sender, string name, object value)
+        protected Dictionary<string, object?> EditorValueChanged(object sender, string name, object value)
         {
-            var editor = (DynamicEditorForm)sender;
+            var editor = (IDynamicEditorForm)sender;
             if (name == "FormLink.ID")
             {
                 var type = typeof(IDynamicEnclosedListGrid<,>).MakeGenericType(typeof(Kanban), typeof(QAQuestion));

+ 1 - 1
prs.desktop/Forms/EntitySelectionGrid.cs

@@ -87,7 +87,7 @@ namespace PRSDesktop
             return new Client<T>().Load(filter).FirstOrDefault();
         }
 
-        protected override void Reload(Filters<T> criteria, Columns<T> columns, ref SortOrder<T> sort, Action<CoreTable, Exception> action)
+        protected override void Reload(Filters<T> criteria, Columns<T> columns, ref SortOrder<T>? sort, Action<CoreTable?, Exception?> action)
         {
             new Client<T>().Query(criteria.Combine(), columns, sort, action);
         }

+ 2 - 2
prs.desktop/Grids/AssignmentGrid.cs

@@ -15,7 +15,7 @@ namespace PRSDesktop
             HiddenColumns.Add(x => x.JobLink.Deleted);
         }
 
-        protected override Dictionary<string, object> EditorValueChanged(DynamicEditorForm editor, Assignment[] items, string name, object value)
+        protected override Dictionary<string, object?> EditorValueChanged(IDynamicEditorForm editor, Assignment[] items, string name, object value)
         {
             var result = base.EditorValueChanged(editor, items, name, value);
 
@@ -47,7 +47,7 @@ namespace PRSDesktop
         }
 
 
-        protected override void AfterLoad(DynamicEditorForm editor, Assignment[] items)
+        protected override void AfterLoad(IDynamicEditorForm editor, Assignment[] items)
         {
             base.AfterLoad(editor, items);
             if (items.FirstOrDefault().ID == Guid.Empty)

+ 3 - 0
prs.desktop/MainWindow.xaml

@@ -317,6 +317,9 @@
                     <fluent:Button x:Name="ProjectTaskButton" Header="Task List"
                                    LargeIcon="pack://application:,,,/Resources/kanban.png"
                                    Click="Tasks_Checked" MinWidth="60" />
+                    <fluent:Button x:Name="ProjectDataButton" Header="Data Entry"
+                                   LargeIcon="pack://application:,,,/Resources/pencil.png"
+                                   Click="DataEntry_Click"  MinWidth="60" />
                     <fluent:Button x:Name="ProjectAttendanceButton" Header="In/Out Board"
                                    LargeIcon="pack://application:,,,/Resources/attendance.png"
                                    Click="Attendance_Checked" MinWidth="60" />

+ 8 - 2
prs.desktop/MainWindow.xaml.cs

@@ -1819,9 +1819,14 @@ namespace PRSDesktop
 
         //    return selected ? tabselected : tabunselected;
         //}
-        
+
         #region Button Event Handlers
-        
+
+        private void DataEntry_Click(object sender, RoutedEventArgs e)
+        {
+            LoadWindow<DataEntryPanel>((Fluent.Button)sender);
+        }
+
         private void Console_Click(object sender, RoutedEventArgs a)
         {
             if (_console is null)
@@ -3960,5 +3965,6 @@ namespace PRSDesktop
 
 
         #endregion
+
     }
 }