Capture user category for new mGAP users (#136)

Author: bbimber

mGAP/resources/schemas/dbscripts/postgresql/mgap-16.67-16.68.sql

@@ -0,0 +1 @@
+ALTER TABLE mGAP.userRequests ADD category varchar(1000);

mGAP/resources/schemas/dbscripts/sqlserver/mgap-16.67-16.68.sql

@@ -0,0 +1 @@
+ALTER TABLE mGAP.userRequests ADD category nvarchar(1000);

mGAP/resources/schemas/mgap.xml

@@ -362,6 +362,10 @@
                 <columnTitle>Institution</columnTitle>
                 <nullable>false</nullable>
             </column>
+            <column columnName="category">
+                <columnTitle>Category</columnTitle>
+                <nullable>true</nullable>
+            </column>
             <column columnName="reason">
                 <columnTitle>Reason For Request</columnTitle>
                 <nullable>false</nullable>

mGAP/resources/views/requestLogin.html

@@ -53,6 +53,14 @@
                 name: 'institution',
                 width: 500,
                 allowBlank: false
+            },{
+                xtype: 'ldk-simplecombo',
+                labelWidth: 130,
+                fieldLabel: 'Category',
+                name: 'category',
+                width: 500,
+                allowBlank: false,
+                storeValues: ['Academic/NPRC', 'Academic/Non-NPRC', 'Foundation', 'Industry', 'Other']
             },{
                 xtype: 'textarea',
                 labelAlign: 'top',

mGAP/src/org/labkey/mgap/mGAPController.java

@@ -197,6 +197,7 @@ public Object execute(RequestUserForm form, BindException errors) throws Excepti
                 row.put("lastName", form.getLastName());
                 row.put("title", form.getTitle());
                 row.put("institution", form.getInstitution());
+                row.put("category", form.getCategory());
                 row.put("reason", form.getReason());
                 row.put("container", mGAPManager.get().getMGapContainer().getId());
 
@@ -259,6 +260,7 @@ public static class RequestUserForm
         private String lastName;
         private String title;
         private String institution;
+        private String category;
         private String reason;
 
         public void setEmail(String email)
@@ -321,6 +323,16 @@ public void setInstitution(String institution)
             this.institution = institution;
         }
 
+        public String getCategory()
+        {
+            return category;
+        }
+
+        public void setCategory(String category)
+        {
+            this.category = category;
+        }
+
         public String getReason()
         {
             return reason;

mGAP/src/org/labkey/mgap/mGAPModule.java

@@ -71,7 +71,7 @@ public String getName()
     @Override
     public Double getSchemaVersion()
     {
-        return 16.67;
+        return 16.68;
     }
 
     @Override