Selaa lähdekoodia

Finalised Logikal and V6 License usages

frogsoftware 8 kuukautta sitten
vanhempi
commit
2120cf125f

+ 1 - 5
prs.classes/Entities/Logikal/LogikalUsage.cs

@@ -4,11 +4,7 @@ using InABox.Core;
 namespace Comal.Classes
 {
     
-    public class LogikalUsage : Entity, IRemotable, IPersistent, ILicense<LogikalLicense>
+    public class LogikalUsage : Entity, IRemotable, ILicense<LogikalLicense>
     {
-        public static void Increment()
-        {
-            Client.Save(new LogikalUsage(),"");
-        }
     }
 }

+ 1 - 5
prs.classes/Entities/V6/V6Usage.cs

@@ -3,11 +3,7 @@ using InABox.Core;
 
 namespace Comal.Classes
 {
-    public class V6Usage : Entity, IRemotable, IPersistent, ILicense<V6License>
+    public class V6Usage : Entity, IRemotable, ILicense<V6License>
     {
-        public static void Increment()
-        {
-            Client.Save(new V6Usage(),"");
-        }
     }
 }

+ 2 - 1
prs.desktop/Utils/LogikalUtils/LogikalClient.cs

@@ -186,7 +186,8 @@ public class LogikalClient : IDisposable
 
     public LogikalResponse Connect()
     {
-        LogikalUsage.Increment();
+        Client.Save(new LogikalUsage(),"");
+        
         Ready = false;
         var _request = new LogikalConnectRequest()
         {

+ 1 - 1
prs.desktop/Utils/MicrosoftSQL/V6Utils/V6Client.cs

@@ -21,7 +21,7 @@ public class V6Client : MicrosoftSQLClient
 
     public V6Client()
     {
-        V6Usage.Increment();
+        Client.Save(new V6Usage(),"");
 
         Settings = new GlobalConfiguration<V6Settings>().Load();
         Settings.CheckSQL();

+ 18 - 1
prs.stores/LogikalUsageStore.cs

@@ -6,7 +6,14 @@ namespace PRSStores;
 
 public class LogikalUsageStore : Store<LogikalUsage>
 {
-    
+    protected override CoreTable OnQuery(Filter<LogikalUsage>? filter, Columns<LogikalUsage>? columns, SortOrder<LogikalUsage>? sort, CoreRange? range)
+    {
+        var _result = new CoreTable();
+        foreach (var column in columns)
+            _result.Columns.Add(new CoreColumn(column.Type, column.Property));
+        return _result;
+    }
+
     protected override void OnSave(LogikalUsage[] entities, ref string auditnote)
     {
         UpdateUserTracking(typeof(LogikalUsage), UserTrackingAction.Write);
@@ -16,4 +23,14 @@ public class LogikalUsageStore : Store<LogikalUsage>
     {
         UpdateUserTracking(typeof(LogikalUsage), UserTrackingAction.Write);
     }
+
+    protected override void OnDelete(IEnumerable<LogikalUsage> entities)
+    {
+        
+    }
+
+    protected override void OnDelete(LogikalUsage entity)
+    {
+        
+    }
 }

+ 19 - 1
prs.stores/V6UsageStore.cs

@@ -6,7 +6,15 @@ namespace PRSStores;
 
 public class V6UsageStore : Store<V6Usage>
 {
-    
+    protected override CoreTable OnQuery(Filter<V6Usage>? filter, Columns<V6Usage>? columns, SortOrder<V6Usage>? sort,
+        CoreRange? range)
+    {
+        var _result = new CoreTable();
+        foreach (var column in columns)
+            _result.Columns.Add(new CoreColumn(column.Type, column.Property));
+        return _result;
+    }
+
     protected override void OnSave(V6Usage[] entities, ref string auditnote)
     {
         UpdateUserTracking(typeof(V6Usage), UserTrackingAction.Write);
@@ -16,4 +24,14 @@ public class V6UsageStore : Store<V6Usage>
     {
         UpdateUserTracking(typeof(V6Usage), UserTrackingAction.Write);
     }
+
+    protected override void OnDelete(IEnumerable<V6Usage> entities)
+    {
+
+    }
+
+    protected override void OnDelete(V6Usage entity)
+    {
+
+    }
 }