Merge pull request #3 from Lombiq/issue/COLI-230

COLI-230: Patient and Caregiver profile editor
Lombiq · Oct 24, 2020 · e212701 · e212701
2 parents e05731c + 480cb4d
commit e212701
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 5 deletions.
diff --git a/Extensions/ContentPartDriverExtensions.cs b/Extensions/ContentPartDriverExtensions.cs
@@ -13,5 +13,21 @@ public static ContentShapeResult InputFieldDisplayShape<TContent>(
             Func<InputFieldViewModel> viewModelFactory) where TContent : ContentPart, new() =>
                 driver.ContentShape(shapeName, () =>
                     (shapeFactory as dynamic).Lombiq_Fields_InputField(ViewModel: viewModelFactory()));
+
+        public static ContentShapeResult TextBoxEditorShape<TContent>(
+            this ContentPartDriver<TContent> driver,
+            string shapeName,
+            IShapeFactory shapeFactory,
+            Func<EditorViewModel> viewModelFactory) where TContent : ContentPart, new() =>
+                driver.ContentShape(shapeName, () =>
+                    (shapeFactory as dynamic).Lombiq_Editors_TextboxEditor(ViewModel: viewModelFactory()));
+
+        public static ContentShapeResult DateTimeEditorShape<TContent>(
+            this ContentPartDriver<TContent> driver,
+            string shapeName,
+            IShapeFactory shapeFactory,
+            Func<DateTimeEditorViewModel> viewModelFactory) where TContent : ContentPart, new() =>
+                driver.ContentShape(shapeName, () =>
+                    (shapeFactory as dynamic).Lombiq_Editors_DateTimeEditor(ViewModel: viewModelFactory()));
     }
 }
diff --git a/ViewModels/DropdownEditorViewModel.cs b/ViewModels/DropdownEditorViewModel.cs
@@ -1,4 +1,5 @@
-using Piedone.HelpfulExtensions;
+using Orchard.Localization;
+using Piedone.HelpfulExtensions;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Linq;
@@ -31,6 +32,8 @@ public class DropdownEditorViewModel : EditorViewModel, IParentElementValueDepen
         #endregion
 
 
+        public DropdownEditorViewModel() { }
+
         public DropdownEditorViewModel(IEnumerable<string> values, params string[] selectedValues)
         {
             foreach (var value in values) SelectList.Add(new SelectListItem
@@ -55,7 +58,29 @@ public DropdownEditorViewModel(NameValueCollection queryString, string technical
 
             Name = TechnicalName = technicalName;
         }
+    }
 
-        public DropdownEditorViewModel() { }
+
+    public static class DropdownEditorViewModelExtensions
+    {
+        public static DropdownEditorViewModel WithDefaultBooleanOptions(
+            this DropdownEditorViewModel viewModel,
+            Localizer T,
+            bool? selectedValue) => viewModel.WithDefaultBooleanOptions(T("Yes").Text, T("No").Text, selectedValue);
+
+        public static DropdownEditorViewModel WithDefaultBooleanOptions(
+            this DropdownEditorViewModel viewModel,
+            string trueLabel,
+            string falseLabel,
+            bool? selectedValue)
+        {
+            viewModel.SelectList = new List<SelectListItem>()
+            {
+                new SelectListItem() { Text = trueLabel ?? "True", Value = "True", Selected = selectedValue == true },
+                new SelectListItem() { Text = falseLabel ?? "False", Value = "False", Selected = selectedValue == false }
+            };
+
+            return viewModel;
+        }
     }
 }
diff --git a/Views/Lombiq.Editors.SelectizeDropdownEditor.cshtml b/Views/Lombiq.Editors.SelectizeDropdownEditor.cshtml
@@ -23,9 +23,15 @@
         { "id", selectizeInputId }
     };
 
-    if (!string.IsNullOrEmpty(viewModel.Label))
+    var labelAttributes = new Dictionary<string, object>
     {
-        attributes.Add("placeholder", viewModel.Label);
+        { "class", "editorLabel textboxEditor__label " + DefaultBlockName + "__label" },
+        { "for", selectizeInputId }
+    };
+
+    if (!string.IsNullOrEmpty(viewModel.Placeholder))
+    {
+        attributes.Add("placeholder", viewModel.Placeholder);
     }
 
     var jsonConverter = WorkContext.Resolve<IJsonConverter>();
@@ -38,6 +44,11 @@
 }
 
 <div class="editor editorField form-group @DefaultBlockName @BlockName">
+    @if (!string.IsNullOrEmpty(viewModel.Label))
+    {
+        @Html.Label(viewModel.Label, labelAttributes)
+    }
+
     @Html.TextBox(viewModel.TechnicalName, "", attributes)
 </div>
 

diff --git a/Views/Lombiq.Editors.TextBoxEditor.cshtml b/Views/Lombiq.Editors.TextBoxEditor.cshtml
@@ -18,11 +18,16 @@
 
     if (viewModel.Required)
     {
-        textboxAttributes["required"] = true;
+        textboxAttributes["required"] = "";
         textboxAttributes["class"] = textboxAttributes["class"] + " required";
         labelAttributes["class"] = labelAttributes["class"] + " required";
     }
 
+    if (viewModel.Disabled)
+    {
+        textboxAttributes["disabled"] = "";
+    }
+
     if (!string.IsNullOrEmpty(viewModel.Placeholder))
     {
         textboxAttributes["placeholder"] = viewModel.Placeholder;