2020-06-29 19:26:50 +00:00
parent 69f17a7eb0
commit 15759bef90
10 changed files with 40 additions and 21 deletions
--- a/server/AyaNova/DataList/AttachmentDataList.cs
+++ b/server/AyaNova/DataList/AttachmentDataList.cs
@@ -17,31 +17,25 @@ namespace AyaNova.DataList
            dynamic dlistView = new JArray();

            dynamic cm = new JObject();
-            cm.fld = "username";
+            cm.fld = "displayfilename";
            dlistView.Add(cm);

            cm = new JObject();
-            cm.fld = "useremployeenumber";
+            cm.fld = "ayatype";
            dlistView.Add(cm);

            cm = new JObject();
-            cm.fld = "usertype";
+            cm.fld = "size";
            dlistView.Add(cm);

            cm = new JObject();
-            cm.fld = "useractive";
+            cm.fld = "notes";
            dlistView.Add(cm);

            cm = new JObject();
-            cm.fld = "userlastlogin";
+            cm.fld = "exists";
            dlistView.Add(cm);

-            cm = new JObject();
-            cm.fld = "userroles";
-            dlistView.Add(cm);
-
-
-

            DefaultListView = dlistView.ToString(Newtonsoft.Json.Formatting.None);

@@ -71,6 +65,22 @@ namespace AyaNova.DataList



+            FieldDefinitions.Add(new AyaDataListFieldDefinition
+            {
+                TKey = "AyaType",
+                FieldKey = "ayatype",
+                UiFieldDataType = (int)UiFieldDataType.Enum,
+                EnumType = AyaNova.Util.StringUtil.TrimTypeName(typeof(AyaType).ToString()),
+                SqlValueColumnName = "afileattachment.AttachToObjectType"
+            });
+
+            FieldDefinitions.Add(new AyaDataListFieldDefinition
+            {
+                TKey = "FileSize",
+                FieldKey = "size",
+                UiFieldDataType = (int)UiFieldDataType.Integer,
+                SqlValueColumnName = "afileattachment.size"
+            });

            FieldDefinitions.Add(new AyaDataListFieldDefinition
            {
--- a/server/AyaNova/biz/BizRoles.cs
+++ b/server/AyaNova/biz/BizRoles.cs
@@ -555,7 +555,7 @@ namespace AyaNova.Biz
            // System.Diagnostics.Debugger.Log(1, "JSONFRAGMENTFORCLIENT", json);

            //ONGOING VALIDATION TO CATCH MISMATCH WHEN NEW ROLES ADDED (wont' catch changes to existing unfortunately)                                   
-            var lastRoles = "{\"Customer\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"Contract\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"HeadOffice\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"LoanUnit\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"Part\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"PM\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"PMItem\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"PMTemplate\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"PMTemplateItem\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"Project\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"PurchaseOrder\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"Quote\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"QuoteItem\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"QuoteTemplate\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"QuoteTemplateItem\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"Unit\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"UnitModel\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"Vendor\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"WorkOrder\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"WorkOrderItem\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"WorkOrderItemExpense\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"WorkOrderItemLabor\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"WorkOrderItemLoan\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"WorkOrderItemPart\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"WorkOrderItemPartRequest\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"WorkOrderItemScheduledUser\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"WorkOrderItemTask\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"WorkOrderItemTravel\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"WorkOrderItemUnit\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"WorkOrderTemplate\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"WorkOrderTemplateItem\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"Global\":{\"Change\":2,\"ReadFullRecord\":1,\"Select\":0},\"GlobalOps\":{\"Change\":16384,\"ReadFullRecord\":8192,\"Select\":0},\"User\":{\"Change\":2,\"ReadFullRecord\":1,\"Select\":131071},\"UserOptions\":{\"Change\":2,\"ReadFullRecord\":1,\"Select\":0},\"Widget\":{\"Change\":34,\"ReadFullRecord\":17,\"Select\":131071},\"ServerState\":{\"Change\":16384,\"ReadFullRecord\":131071,\"Select\":0},\"License\":{\"Change\":16386,\"ReadFullRecord\":8193,\"Select\":0},\"TrialSeeder\":{\"Change\":16386,\"ReadFullRecord\":8193,\"Select\":0},\"LogFile\":{\"Change\":0,\"ReadFullRecord\":24576,\"Select\":0},\"Backup\":{\"Change\":16384,\"ReadFullRecord\":8195,\"Select\":0},\"ServerJob\":{\"Change\":16384,\"ReadFullRecord\":8195,\"Select\":0},\"ServerMetrics\":{\"Change\":16384,\"ReadFullRecord\":24576,\"Select\":0},\"Translation\":{\"Change\":16386,\"ReadFullRecord\":131071,\"Select\":0},\"DataListView\":{\"Change\":2,\"ReadFullRecord\":131071,\"Select\":0},\"FormCustom\":{\"Change\":2,\"ReadFullRecord\":131071,\"Select\":0},\"PickListTemplate\":{\"Change\":2,\"ReadFullRecord\":131071,\"Select\":0},\"BizMetrics\":{\"Change\":2,\"ReadFullRecord\":98369,\"Select\":0},\"Notification\":{\"Change\":131071,\"ReadFullRecord\":131071,\"Select\":0},\"NotificationSubscription\":{\"Change\":131071,\"ReadFullRecord\":131071,\"Select\":0}}";
+            var lastRoles = "{\"Customer\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"Contract\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"HeadOffice\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"LoanUnit\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"Part\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"PM\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"PMItem\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"PMTemplate\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"PMTemplateItem\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"Project\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"PurchaseOrder\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"Quote\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"QuoteItem\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"QuoteTemplate\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"QuoteTemplateItem\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"Unit\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"UnitModel\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"Vendor\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"WorkOrder\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"WorkOrderItem\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"WorkOrderItemExpense\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"WorkOrderItemLabor\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"WorkOrderItemLoan\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"WorkOrderItemPart\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"WorkOrderItemPartRequest\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"WorkOrderItemScheduledUser\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"WorkOrderItemTask\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"WorkOrderItemTravel\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"WorkOrderItemUnit\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"WorkOrderTemplate\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"WorkOrderTemplateItem\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"Global\":{\"Change\":2,\"ReadFullRecord\":1,\"Select\":0},\"GlobalOps\":{\"Change\":16384,\"ReadFullRecord\":8192,\"Select\":0},\"User\":{\"Change\":2,\"ReadFullRecord\":1,\"Select\":131071},\"UserOptions\":{\"Change\":2,\"ReadFullRecord\":1,\"Select\":0},\"Widget\":{\"Change\":34,\"ReadFullRecord\":17,\"Select\":131071},\"ServerState\":{\"Change\":16384,\"ReadFullRecord\":131071,\"Select\":0},\"License\":{\"Change\":16386,\"ReadFullRecord\":8193,\"Select\":0},\"TrialSeeder\":{\"Change\":16386,\"ReadFullRecord\":8193,\"Select\":0},\"LogFile\":{\"Change\":0,\"ReadFullRecord\":24576,\"Select\":0},\"Backup\":{\"Change\":16384,\"ReadFullRecord\":8195,\"Select\":0},\"FileAttachment\":{\"Change\":2,\"ReadFullRecord\":3,\"Select\":0},\"ServerJob\":{\"Change\":16384,\"ReadFullRecord\":8195,\"Select\":0},\"ServerMetrics\":{\"Change\":16384,\"ReadFullRecord\":24576,\"Select\":0},\"Translation\":{\"Change\":16386,\"ReadFullRecord\":131071,\"Select\":0},\"DataListView\":{\"Change\":2,\"ReadFullRecord\":131071,\"Select\":0},\"FormCustom\":{\"Change\":2,\"ReadFullRecord\":131071,\"Select\":0},\"PickListTemplate\":{\"Change\":2,\"ReadFullRecord\":131071,\"Select\":0},\"BizMetrics\":{\"Change\":2,\"ReadFullRecord\":98369,\"Select\":0},\"Notification\":{\"Change\":131071,\"ReadFullRecord\":131071,\"Select\":0},\"NotificationSubscription\":{\"Change\":131071,\"ReadFullRecord\":131071,\"Select\":0}}";

            Dictionary<AyaType, BizRoleSet> lastRolesDeserialized = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<AyaType, BizRoleSet>>(lastRoles);
            if (lastRolesDeserialized.Count != roles.Count)
--- a/server/AyaNova/generator/CoreJobMetricsSnapshot.cs
+++ b/server/AyaNova/generator/CoreJobMetricsSnapshot.cs
@@ -100,7 +100,7 @@ namespace AyaNova.Biz
                log.LogTrace("DD metrics snapshot");
                var now = DateTime.UtcNow;
                //FILES ON DISK
-                var UtilFilesInfo = FileUtil.GetUtilityFolderSizeInfo();
+                var UtilFilesInfo = FileUtil.GetBackupFolderSizeInfo();
                var AttachmentFilesInfo = FileUtil.GetAttachmentFolderSizeInfo();

                //Available space
--- a/server/AyaNova/models/FileAttachment.cs
+++ b/server/AyaNova/models/FileAttachment.cs
@@ -35,5 +35,8 @@ namespace AyaNova.Models
        [Required]
        public bool Exists { get; set; }//was on disk last sync check

+        [Required]
+        public long Size { get; set; }
+
    }
 }
--- a/server/AyaNova/resource/de.json
+++ b/server/AyaNova/resource/de.json
@@ -1838,5 +1838,6 @@
  "LastLogin":"Letzte Anmeldezeit",
  "Import":"Importieren",
  "Export":"Exportieren",
-  "ReadOnly":"Schreibgeschützt"
+  "ReadOnly":"Schreibgeschützt",
+  "AyaType":"Typ"
 }
--- a/server/AyaNova/resource/en.json
+++ b/server/AyaNova/resource/en.json
@@ -1838,7 +1838,8 @@
  "LastLogin":"Last login",
  "Import":"Import",
  "Export":"Export",
-  "ReadOnly":"Read only"
+  "ReadOnly":"Read only",
+  "AyaType":"Type"


 }
--- a/server/AyaNova/resource/es.json
+++ b/server/AyaNova/resource/es.json
@@ -1838,5 +1838,6 @@
  "LastLogin":"Última hora de inicio de sesión",
  "Import":"Importar",
  "Export":"Exportar",
-  "ReadOnly":"Sólo lectura"
+  "ReadOnly":"Sólo lectura",
+  "AyaType":"Tipo"
 }
--- a/server/AyaNova/resource/fr.json
+++ b/server/AyaNova/resource/fr.json
@@ -1838,5 +1838,6 @@
  "LastLogin":"Dernière connexion",
  "Import":"Importer",
  "Export":"Exporter",
-  "ReadOnly":"Lecture seule"
+  "ReadOnly":"Lecture seule",
+  "AyaType":"Type"
 }
--- a/server/AyaNova/util/AySchema.cs
+++ b/server/AyaNova/util/AySchema.cs
@@ -22,7 +22,7 @@ namespace AyaNova.Util
        //!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImporting WHEN NEW TABLES ADDED!!!!
        private const int DESIRED_SCHEMA_LEVEL = 11;

-        internal const long EXPECTED_COLUMN_COUNT = 326;
+        internal const long EXPECTED_COLUMN_COUNT = 327;
        internal const long EXPECTED_INDEX_COUNT = 134;

        //!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImporting WHEN NEW TABLES ADDED!!!!
@@ -391,7 +391,7 @@ $BODY$;

                await ExecQueryAsync("CREATE TABLE afileattachment (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, " +
                "attachtoobjectid bigint not null, attachtoobjecttype integer not null, " +
-                "storedfilename text not null, displayfilename text not null, contenttype text, lastmodified timestamp not null, notes text, exists bool not null)");
+                "storedfilename text not null, displayfilename text not null, contenttype text, lastmodified timestamp not null, notes text, exists bool not null, size bigint not null)");

                //index required for ops that need to check if file already in db (delete, count refs etc)
                //LOOKAT: isn't this useless without the ID as well or is that not fetched?
--- a/server/AyaNova/util/FileUtil.cs
+++ b/server/AyaNova/util/FileUtil.cs
@@ -356,6 +356,7 @@ namespace AyaNova.Util
            EnsurePath(permanentPath);

            var permanentFilePath = Path.Combine(permanentPath, hash);
+            var FileSize = new FileInfo(tempFilePath).Length;

            //See if the file was already uploaded, if so then ignore it for now
            if (File.Exists(permanentFilePath))
@@ -380,7 +381,8 @@ namespace AyaNova.Util
                ContentType = contentType,
                AttachToObjectId = attachToObject.ObjectId,
                AttachToObjectType = attachToObject.ObjectType,
-                LastModified = lastModified
+                LastModified = lastModified,
+                Size = FileSize

            };

@@ -631,7 +633,7 @@ namespace AyaNova.Util
        /// Utility / backup folder file size info
        /// </summary>
        /// <returns></returns>
-        internal static FolderSizeInfo GetUtilityFolderSizeInfo()
+        internal static FolderSizeInfo GetBackupFolderSizeInfo()
        {
            return GetDirectorySize(new DirectoryInfo(BackupFilesFolder));
        }