From 816ccc5e912e8d04a3282f76bb5b084f13a6f5b6 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Wed, 15 Jan 2020 18:55:26 +0000
Subject: [PATCH]

---
 FormCustom/FormCustom.cs | 21 ++++++++++++--
 util.cs                  | 61 +++++++++++++++++++---------------------
 2 files changed, 48 insertions(+), 34 deletions(-)

diff --git a/FormCustom/FormCustom.cs b/FormCustom/FormCustom.cs
index 20fe14d..24cb567 100644
--- a/FormCustom/FormCustom.cs
+++ b/FormCustom/FormCustom.cs
@@ -9,7 +9,22 @@ namespace raven_integration
 {
 
     public class FormCustom
+    { 
+        public enum AyaDataType : int
     {
+        NoType = 0,
+        DateTime = 1,
+        Date = 2,
+        Time = 3,
+        Text = 4,
+        Integer = 5,
+        Bool = 6,
+        Decimal = 7,
+        Currency = 8,
+        Tags = 9,
+        Enum = 10
+
+    }
 
         /// <summary>
         /// Test create or update
@@ -19,7 +34,9 @@ namespace raven_integration
         {
 
             //This is a special case, you can  PUT a formcustom, but you can't delete one and you can't create one
+/*
 
+*/
 
             dynamic d = new JObject();
             d.formkey = "user";
@@ -30,7 +47,7 @@ namespace raven_integration
             dt.fld = "UserCustom1";
             dt.hide = false;
             dt.required = true;
-            dt.type = "text";
+            dt.type = AyaDataType.Text;
             dtemplate.Add(dt);
 
 
@@ -43,7 +60,7 @@ namespace raven_integration
             dt.fld = "UserCustom2";
             dt.hide = true;
             dt.required = false;
-            dt.type = "bool";
+            dt.type = AyaDataType.Bool;
             dtemplate.Add(dt);
 
             d.template = dtemplate.ToString();//it expects it to be a json string, not actual json
diff --git a/util.cs b/util.cs
index 90e7a17..4950bf3 100644
--- a/util.cs
+++ b/util.cs
@@ -490,54 +490,51 @@ namespace raven_integration
         /// <returns></returns>
         public static string WidgetRequiredCustomFieldsJsonString()
         {/*CURRENT TEMPLATE DEFINITION FOR WIDGET CUSTOM FIELDS, FROM SEEDER.CS SERVER PROJECT
-         Template = @"[
+          var fc = new FormCustom()
+                    {
+                        FormKey = ObjectFields.WIDGET_KEY,
+                        Template = @"[
                                             {
                                             ""fld"": ""WidgetNotes"",
-                                            ""required"": ""true""
+                                            ""required"": true
+                                            },                                           
+                                            {
+                                            ""fld"": ""WidgetCustom1"",                                           
+                                            ""required"": false,
+                                            ""type"": 1
                                             },
                                             {
-                                            ""fld"": ""WidgetCustom1"",
-                                            ""hide"": ""false"",
-                                            ""required"": ""false"",
-                                            ""type"": ""datetime""
+                                            ""fld"": ""WidgetCustom2"",                                           
+                                            ""required"": true,
+                                            ""type"": 4
                                             },
                                             {
-                                            ""fld"": ""WidgetCustom2"",
-                                            ""hide"": ""false"",
-                                            ""required"": ""true"",
-                                            ""type"": ""text""
+                                            ""fld"": ""WidgetCustom3"",                                            
+                                            ""required"": false,
+                                            ""type"": 5
                                             },
                                             {
-                                            ""fld"": ""WidgetCustom3"",
-                                            ""hide"": ""false"",
-                                            ""required"": ""false"",
-                                            ""type"": ""number""
+                                            ""fld"": ""WidgetCustom4"",                                           
+                                            ""required"": false,
+                                            ""type"": 6
                                             },
                                             {
-                                            ""fld"": ""WidgetCustom4"",
-                                            ""hide"": ""false"",
-                                            ""required"": ""false"",
-                                            ""type"": ""bool""
+                                            ""fld"": ""WidgetCustom5"",                                            
+                                            ""required"": false,
+                                            ""type"": 8
                                             },
                                             {
-                                            ""fld"": ""WidgetCustom5"",
-                                            ""hide"": ""false"",
-                                            ""required"": ""false"",
-                                            ""type"": ""currency""
+                                            ""fld"": ""WidgetCustom6"",                                           
+                                            ""required"": false,
+                                            ""type"": 2
                                             },
                                             {
-                                            ""fld"": ""WidgetCustom6"",
-                                            ""hide"": ""false"",
-                                            ""required"": ""false"",
-                                            ""type"": ""date""
-                                            },
-                                            {
-                                            ""fld"": ""WidgetCustom7"",
-                                            ""hide"": ""false"",
-                                            ""required"": ""false"",
-                                            ""type"": ""time""
+                                            ""fld"": ""WidgetCustom7"",                                           
+                                            ""required"": false,
+                                            ""type"": 3
                                             }
                                         ]"
+                    };
          */
 
             //Custom fields