Merge pull request #2115 from BEXIS2/rc

Rc v4.0.2

Author: DavidBlaa

Components/AAA/BExIS.Security.Services/Subjects/GroupManager.cs

@@ -62,7 +62,7 @@ public List<Group> GetGroups(FilterExpression filter, OrderByExpression orderBy,
                     }
                     else if (whereClause != null)
                     {
-                        var filtered = GroupRepository.Query(whereClause);
+                        var filtered = Groups.Where(whereClause);
                         count = filtered.Count();
 
                         return filtered.Skip((pageNumber - 1) * pageSize).Take(pageSize).ToList();

Components/AAA/BExIS.Security.Services/Subjects/SubjectManager.cs

@@ -49,7 +49,7 @@ public List<Subject> GetSubjects(FilterExpression filter, OrderByExpression orde
                 {
                     if (whereClause != null && orderBy != null)
                     {
-                        var l = SubjectRepository.Query(whereClause);
+                        var l = Subjects.Where(whereClause);
                         var x = l.OrderBy(orderbyClause);
                         var y = x.Skip((pageNumber - 1) * pageSize);
                         var z = y.Take(pageSize);

Components/AAA/BExIS.Security.Services/Subjects/UserManager.cs

@@ -52,7 +52,7 @@ public List<User> GetUsers(FilterExpression filter, OrderByExpression orderBy, i
             {
                 if (whereClause != null && orderBy != null)
                 {
-                    var l = UserRepository.Query(whereClause);
+                    var l = Users.Where(whereClause);
                     var x = l.OrderBy(orderbyClause);
                     var y = x.Skip((pageNumber - 1) * pageSize);
                     var z = y.Take(pageSize);

Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Controllers/FormController.cs

@@ -228,7 +228,7 @@ public ActionResult LoadMetadataByVersion(long entityId, int version=-1, bool lo
 
             ViewBag.Title = PresentationModel.GetViewTitleForTenant("Edit Metadata", this.Session.GetTenant());
             ViewData["Locked"] = locked;
-            ViewData["ShowOptional"] = false;
+            ViewData["ShowOptional"] = fromEditMode;
             ViewData["EntityId"] = entityId;
 
             // Set dataset Title to Model

Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Models/Metadata/MetadataAttributeModel.cs

@@ -88,7 +88,7 @@ public object Value
                     }
                 }
 
-                IsEmpty = global::System.Convert.ChangeType(_value, _value.GetType()) == null || String.IsNullOrEmpty(_value.ToString()) || _value.Equals(DefaultValue) || _value.Equals(FixedValue) ;
+                IsEmpty = global::System.Convert.ChangeType(_value, _value.GetType()) == null || String.IsNullOrEmpty(_value.ToString()); /*|| _value.Equals(DefaultValue) || _value.Equals(FixedValue)*/ ;
             }
         }
 

Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/Form/_metadataAttributeView.cshtml

@@ -143,7 +143,11 @@
 
 <div id="@id" class="metadataAttributeContent" onload="metadataAttributeOnLoad(this, @hasErrors)">
 
-    @if (@Model != null && !(!showOptional && Model.IsEmpty && (Model.MinCardinality == 0) && locked))
+    @if (@Model != null && 
+        !(
+        !showOptional && 
+        (Model.IsEmpty && string.IsNullOrEmpty(Model.FixedValue)) && 
+        (Model.MinCardinality == 0) && locked))
     {
     <table>
         <tr><td></td><td><div id="help_@idInput" class="help" style="display: none;">@Html.Raw(Model.Discription)</div></td></tr>

Console/BExIS.Web.Shell/Areas/SAM/BExIS.Modules.Sam.UI/Models/UserModels.cs

@@ -19,10 +19,10 @@ public class ReadUserModel
         public string UserName { get; set; }
 
         [JsonProperty("creationDate")]
-        public DateTimeOffset CreationDate { get; set; }
+        public DateTime CreationDate { get; set; }
 
         [JsonProperty("modificationDate")]
-        public DateTimeOffset ModificationDate { get; set; }
+        public DateTime ModificationDate { get; set; }
 
         public static ReadUserModel Convert(User user)
         {
@@ -31,8 +31,8 @@ public static ReadUserModel Convert(User user)
                 Id = user.Id,
                 UserName = user.UserName,
                 Email = user.Email,
-                CreationDate = DateTimeOffset.Now,
-                ModificationDate = DateTimeOffset.Now
+                CreationDate = user.RegistrationDate,
+                ModificationDate = user.RegistrationDate
             };
         }
     }
@@ -83,7 +83,7 @@ public class UserGridRowModel
         public string Name { get; set; }
         public string DisplayName { get; set; }
         public string IsEmailConfirmed { get; set; }
-        public DateTimeOffset RegistrationDate { get; set; }
+        public DateTime RegistrationDate { get; set; }
 
         public static UserGridRowModel Convert(User user)
         {

database update scripts/4.0.1-4.0.2.sql

@@ -15,6 +15,32 @@ INSERT INTO public.operations (versionno, extra, module, controller, action, fea
 SELECT 1, NULL, 'RPM', 'File', '*', null 
 WHERE NOT EXISTS (SELECT * FROM public.operations WHERE module='RPM' AND controller='File');
 
+-- set all meanings to variable_templates
+INSERT INTO rpm_meanings_variables (variableref, meaningref)
+SELECT v.id, m.id
+FROM variables v, RPM_MEANINGS M
+WHERE v.label = m.name and 
+v.variablestype = 'VAR_TEMPL' and
+NOT EXISTS (
+    SELECT 1
+    FROM rpm_meanings_variables mv
+    WHERE mv.variableref = v.id
+      AND mv.meaningref = m.id
+  );
+
+-- set all meanings from template to instance variables
+INSERT INTO rpm_meanings_variables (variableref, meaningref)
+SELECT v.id, mv.meaningref
+FROM variables v, rpm_meanings_variables mv
+WHERE v.vartemplateref = mv.variableref and 
+v.variablestype = 'VAR_INST' and
+NOT EXISTS (
+    SELECT 1
+    FROM rpm_meanings_variables mv
+    WHERE mv.variableref = v.id
+      AND mv.meaningref = mv.meaningref
+  );
+
 -- BEXIS2 Version Update
 INSERT INTO public.versions(
 	versionno, extra, module, value, date)