scheduler

Author: leedavi

Componants/LocalUtils.cs

@@ -46,6 +46,15 @@ public static string SaveData(NBrightInfo ajaxInfo)
                 info.SetXmlProperty("genxml/checkbox/active", ajaxInfo.GetXmlProperty("genxml/checkbox/active"));
                 info.SetXmlProperty("genxml/checkbox/autoremoveusers", ajaxInfo.GetXmlProperty("genxml/checkbox/autoremoveusers"));
                 info.SetXmlProperty("genxml/checkbox/debugmode", ajaxInfo.GetXmlProperty("genxml/checkbox/debugmode"));
+                var editlang = ajaxInfo.GetXmlProperty("genxml/hidden/editlang");
+                var lastrun = ajaxInfo.GetXmlProperty("genxml/textbox/lastrun");
+                if (Utils.IsDate(lastrun, editlang))
+                {
+                    var cultureInfo = new CultureInfo(editlang, true);
+                    var lastrundate = Convert.ToDateTime(lastrun, cultureInfo);
+                    lastrundate = lastrundate.Date.AddMinutes(130); // Make it 2:10 in the morning so scheudler runs if testing.
+                    info.SetXmlProperty("genxml/textbox/lastrun", lastrundate.ToString("O"), TypeCode.DateTime);
+                }
             }
             objCtrl.Update(info);
             DataCache.ClearCache();
@@ -76,19 +85,28 @@ public static void ExecuteGDPR()
         }
         public static void SchedulerActionGDPR(int portalId)
         {
+            LogSystem("OS_GDPR - Scheduler: " + DateTime.Now.ToString());
             var objCtrl = new NBrightBuyController();
             var info = objCtrl.GetByGuidKey(portalId, -1, "OS_GDPRDATA", "OS_GDPRDATA");
             var strlastrun = info.GetXmlProperty("genxml/textbox/lastrun");
-            if (Utils.IsDate(strlastrun,"en-US"))
+            var debugmode = info.GetXmlPropertyBool("genxml/checkbox/debugmode");
+            if (Utils.IsDate(strlastrun))
             {
                 var lastrun = Convert.ToDateTime(strlastrun);
                 // run between 2am - 3am, once a day.
                 if ((lastrun < DateTime.Now.Date && DateTime.Now > DateTime.Now.Date.AddHours(2)))
                 {
                     LogSystem("OS_GDPR --------------- START Scheduler ---------------");
-                    LogSystem("OS_GDPR - Scheduler: " + DateTime.Now.ToString());
                     ActionGDPR(portalId);
                 }
+                else
+                {
+                    LogSystem("OS_GDPR - Scheduler: Invalid Date Time (2am - 3am required)");
+                }
+            }
+            else
+            {
+                LogSystem("OS_GDPR - Scheduler: Invalid Last Run Date.");
             }
         }
 

DNNpackager.dnnpack

@@ -25,5 +25,6 @@
   </file>
 	<assembly>
 		<value>\bin\OS_GDPR.dll</value>
+    <value>\bin\OS_GDPR.pdb</value>
   </assembly>  
 </root>

Docs/os_gdpr_docs.md

@@ -139,3 +139,7 @@ The Scheduler is setup and creates a list of users that should be removed.  Manu
 
 A list of users that need to be removed is created when the "Execute Button" is clicked in the UI.  After that users can be removed via the UI.
 
+#### Remove Single User
+If a client demands to be removed, the UI allows you to search for a user, but email or partial email.  
+Clicking the "Execute" button will activate the search and add the user to the UI list, it can then be manualy removed. (If the user exists in the system)
+

Themes/config/default/datafields.cshtml

@@ -5,6 +5,7 @@
 @using NBrightDNN
 @using DotNetNuke.Entities.Users;
 @using System.Xml;
+@using NBrightCore.common;
 
 @AddMetaData("resourcepath", "/DesktopModules/NBright/NBrightBuy/App_LocalResources/")
 @AddMetaData("resourcepath", "/DesktopModules/NBright/OS_GDPR/App_LocalResources/")
@@ -23,7 +24,7 @@
 
 
     <input id="itemid" type="hidden" value="@info.ItemID" />
-    <input id="editlang" type="hidden" value="@info.Lang" />
+    <input id="editlang" type="hidden" value="@Utils.GetCurrentCulture()" />
 
     <div class="col-xs-12 col-sm-12">
         <div class="form-group depotdetail">
@@ -64,12 +65,13 @@
                     <label>@ResourceKey("Admin.autoremoveusers")</label>
                     @CheckBox(info, "genxml/checkbox/autoremoveusers", "", "")
                 </div>
-                <div class="col-sm-3">
+                <div class="col-sm-6">
                     @if (DnnUtils.IsInRole("Administrator"))
                     {
                         <br />
                         <label>DEBUG MODE</label>
-                        @CheckBox(info, "genxml/checkbox/debugmode", "", "")
+                        @CheckBox(info, "genxml/checkbox/debugmode", "", "") 
+                        <b>&nbsp;IMPORTANT: Turn off for live site.</b>
                     }
                 </div>
             </div>