2022-12-29 01:35:22 +00:00
parent 5e1ffa39d5
commit 29fbccf667
3 changed files with 35 additions and 29 deletions
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -35,7 +35,7 @@
        "SOCKEYE_DB_CONNECTION": "Server=localhost;Username=postgres;Password=sockeye;Database=sockeye;CommandTimeout=300;",
        "SOCKEYE_DATA_PATH": "c:\\temp\\sockeye",
        "SOCKEYE_USE_URLS": "http://*:7676;",
-        "SOCKEYE_PERMANENTLY_ERASE_DATABASE":"true",
+        //"SOCKEYE_PERMANENTLY_ERASE_DATABASE":"true",
        //"SOCKEYE_REMOVE_LICENSE_FROM_DB":"true",
        //"SOCKEYE_REPORT_RENDERING_TIMEOUT":"1",
        "SOCKEYE_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_14\\bin"
--- a/server/DataList/LicenseDataList.cs
+++ b/server/DataList/LicenseDataList.cs
@@ -14,8 +14,8 @@ namespace Sockeye.DataList

            var RoleSet = BizRoles.GetRoleSet(DefaultListAType);
            AllowedRoles = RoleSet.ReadFullRecord | RoleSet.Change;
-            DefaultColumns = new List<string>() { "licenseid", "licensecreated", "licensecustomer", "licenseregto", "licensemaintexpire", "licenseexpire" };
-            DefaultSortBy = new Dictionary<string, string>() { { "licenseid", "-" } };
+            DefaultColumns = new List<string>() { "licensecreated",  "licenseregto", "licensecustomer", "LicenseFetchedOn", "licensetags" };
+            DefaultSortBy = new Dictionary<string, string>() { { "licensecreated", "-" } };
            FieldDefinitions = new List<DataListFieldDefinition>();
            /*
            "License": "License",
@@ -40,23 +40,35 @@ namespace Sockeye.DataList
            + "wiki TEXT, tags VARCHAR(255) ARRAY )");
            */

-            FieldDefinitions.Add(new DataListFieldDefinition
-            {
-                TKey = "LicenseSerial",
-                FieldKey = "licenseid",
-                SockType = (int)SockType.License,
-                UiFieldDataType = (int)UiFieldDataType.Integer,
-                SqlIdColumnName = "alicense.id",
-                SqlValueColumnName = "alicense.id",
-                IsRowId = true
-            });
+            // FieldDefinitions.Add(new DataListFieldDefinition
+            // {
+            //     TKey = "LicenseSerial",
+            //     FieldKey = "licenseid",
+            //     SockType = (int)SockType.License,
+            //     UiFieldDataType = (int)UiFieldDataType.Integer,
+            //     SqlIdColumnName = "alicense.id",
+            //     SqlValueColumnName = "alicense.id",
+            //     IsRowId = true
+            // });

            FieldDefinitions.Add(new DataListFieldDefinition
            {
                TKey = "Created",
                FieldKey = "licensecreated",
+                SockType = (int)SockType.License,
                UiFieldDataType = (int)UiFieldDataType.DateTime,
-                SqlValueColumnName = "alicense.created"
+                SqlValueColumnName = "alicense.created",
+                IsRowId = true
+            });
+
+            FieldDefinitions.Add(new DataListFieldDefinition
+            {
+                TKey = "LicenseRegTo",
+                FieldKey = "licenseregto",
+                SockType = (int)SockType.License,
+                UiFieldDataType = (int)UiFieldDataType.Text,
+                SqlIdColumnName = "alicense.id",
+                SqlValueColumnName = "alicense.regto"
            });

            FieldDefinitions.Add(new DataListFieldDefinition
@@ -77,13 +89,7 @@ namespace Sockeye.DataList
                SqlValueColumnName = "alicense.tags"
            });

-            FieldDefinitions.Add(new DataListFieldDefinition
-            {
-                TKey = "LicenseRegTo",
-                FieldKey = "licenseregto",
-                UiFieldDataType = (int)UiFieldDataType.Text,
-                SqlValueColumnName = "alicense.regto"
-            });
+

            FieldDefinitions.Add(new DataListFieldDefinition
            {
--- a/server/util/AySchema.cs
+++ b/server/util/AySchema.cs
@@ -917,43 +917,43 @@ $BODY$ LANGUAGE PLPGSQL STABLE");
                #region LICENSE
                //english translations
                await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'LicenseList', 'Licenses' FROM atranslation t  where t.baselanguage = 'en'");
-                await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'LicenseRegTo', 'Registered to' FROM atranslation t  where t.baselanguage = 'en'");
+                await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'LicenseRegTo', 'Licensed to' FROM atranslation t  where t.baselanguage = 'en'");
                await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'LicenseKey', 'License key' FROM atranslation t  where t.baselanguage = 'en'");
                await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'LicenseFetchCode', 'Fetch code' FROM atranslation t  where t.baselanguage = 'en'");
                await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'LicenseFetchEmail', 'Fetch email' FROM atranslation t  where t.baselanguage = 'en'");
                await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'LicenseFetchedOn', 'Fetched date' FROM atranslation t  where t.baselanguage = 'en'");
                await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'LicenseDBID', 'DBID' FROM atranslation t  where t.baselanguage = 'en'");
-                await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'LicenseMaintenanceExpire', 'Maintenance expire to' FROM atranslation t  where t.baselanguage = 'en'");
+                await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'LicenseMaintenanceExpire', 'Maintenance expires' FROM atranslation t  where t.baselanguage = 'en'");

                //spanish translations
                await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'LicenseList', 'Licenses' FROM atranslation t  where t.baselanguage = 'es'");
-                await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'LicenseRegTo', 'Registered to' FROM atranslation t  where t.baselanguage = 'es'");
+                await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'LicenseRegTo', 'Licensed to' FROM atranslation t  where t.baselanguage = 'es'");
                await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'LicenseKey', 'License key' FROM atranslation t  where t.baselanguage = 'es'");
                await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'LicenseFetchCode', 'Fetch code' FROM atranslation t  where t.baselanguage = 'es'");
                await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'LicenseFetchEmail', 'Fetch email' FROM atranslation t  where t.baselanguage = 'es'");
                await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'LicenseFetchedOn', 'Fetched date' FROM atranslation t  where t.baselanguage = 'es'");
                await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'LicenseDBID', 'DBID' FROM atranslation t  where t.baselanguage = 'es'");
-                await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'LicenseMaintenanceExpire', 'Maintenance expire to' FROM atranslation t  where t.baselanguage = 'es'");
+                await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'LicenseMaintenanceExpire', 'Maintenance expires' FROM atranslation t  where t.baselanguage = 'es'");

                //french translations
                await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'LicenseList', 'Licenses' FROM atranslation t  where t.baselanguage = 'fr'");
-                await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'LicenseRegTo', 'Registered to' FROM atranslation t  where t.baselanguage = 'fr'");
+                await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'LicenseRegTo', 'Licensed to' FROM atranslation t  where t.baselanguage = 'fr'");
                await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'LicenseKey', 'License key' FROM atranslation t  where t.baselanguage = 'fr'");
                await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'LicenseFetchCode', 'Fetch code' FROM atranslation t  where t.baselanguage = 'fr'");
                await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'LicenseFetchEmail', 'Fetch email' FROM atranslation t  where t.baselanguage = 'fr'");
                await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'LicenseFetchedOn', 'Fetched date' FROM atranslation t  where t.baselanguage = 'fr'");
                await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'LicenseDBID', 'DBID' FROM atranslation t  where t.baselanguage = 'fr'");
-                await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'LicenseMaintenanceExpire', 'Maintenance expire to' FROM atranslation t  where t.baselanguage = 'fr'");
+                await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'LicenseMaintenanceExpire', 'Maintenance expires' FROM atranslation t  where t.baselanguage = 'fr'");

                //german translations
                await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'LicenseList', 'Licenses' FROM atranslation t  where t.baselanguage = 'de'");
-                await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'LicenseRegTo', 'Registered to' FROM atranslation t  where t.baselanguage = 'de'");
+                await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'LicenseRegTo', 'Licensed to' FROM atranslation t  where t.baselanguage = 'de'");
                await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'LicenseKey', 'License key' FROM atranslation t  where t.baselanguage = 'de'");
                await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'LicenseFetchCode', 'Fetch code' FROM atranslation t  where t.baselanguage = 'de'");
                await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'LicenseFetchEmail', 'Fetch email' FROM atranslation t  where t.baselanguage = 'de'");
                await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'LicenseFetchedOn', 'Fetched date' FROM atranslation t  where t.baselanguage = 'de'");
                await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'LicenseDBID', 'DBID' FROM atranslation t  where t.baselanguage = 'de'");
-                await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'LicenseMaintenanceExpire', 'Maintenance expire to' FROM atranslation t  where t.baselanguage = 'de'");
+                await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'LicenseMaintenanceExpire', 'Maintenance expires' FROM atranslation t  where t.baselanguage = 'de'");

                #endregion license