LP#1902939: Student Card SQL/IDL changes

diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index 14736ac..3681c53 100644 (file)
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -13901,26 +13901,57 @@ SELECT  usr,
                        <field name="id"                reporter:datatype="id"       reporter:label="District ID"/>
                        <field name="code"              reporter:datatype="text"     reporter:label="District Code"/>
                        <field name="name"              reporter:datatype="text"     reporter:label="District Name"/>
-                       <field name="context_org"       reporter:datatype="org_unit" reporter:label="Context Org" oils_obj:required="true"/>
-                       <field name="enabled"           reporter:datatype="bool"     reporter:label="Enabled"/>
-                       <field name="perm"              reporter:datatype="link"     reporter:label="Permission Required by User" oils_obj:required="true"/>
-                       <field name="restrict_to_org"   reporter:datatype="bool"     reporter:label="Restrict by Home Library"/>
-                       <field name="allow_inactive"    reporter:datatype="bool"     reporter:label="Allow Inactive Users"/>
+                       <field name="active"            reporter:datatype="bool"     reporter:label="Active?"/>
+                       <field name="state_id"          reporter:datatype="int"      reporter:label="State ID"/>
+                       <field name="contact_name"      reporter:datatype="text"     reporter:label="District Contact Person"/>
+                       <field name="contact_email"     reporter:datatype="text"     reporter:label="District Contact Email"/>
+                       <field name="ftp_host"          reporter:datatype="text"     reporter:label="FTP Hostname"/>
+                       <field name="ftp_port"          reporter:datatype="integer"  reporter:label="FTP Custom Port"/>
+                       <field name="ftp_user"          reporter:datatype="text"     suppress_controller="open-ils.reporter-store"/>
+                       <field name="ftp_pass"          reporter:datatype="text"     suppress_controller="open-ils.reporter-store open-ils.pcrud"/>
+                       <field name="ftp_remote_dir"    reporter:datatype="text"     reporter:label="FTP Remote Directory"/>
+                       <field name="ftp_exceptions_dir"    reporter:datatype="text"     reporter:label="FTP Exceptions Directory"/>
                        <field name="allow_expired"     reporter:datatype="bool"     reporter:label="Allow Expired Users"/>
                        <field name="block_list"        reporter:datatype="text"     reporter:label="Block List"/>
                        <field name="usr_activity_type" reporter:datatype="link"     reporter:label="User Activity Type"/>
                </fields>
-               <links>
-                       <link field="context_org" reltype="has_a" key="id" map="" class="aou"/>
-                       <link field="perm" reltype="has_a" key="id" map="" class="ppl"/>
-                       <link field="usr_activity_type" reltype="has_a" key="id" map="" class="cuat"/>
-               </links>
                <permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
                        <actions>
-                               <create permission="ADMIN_REMOTEAUTH" context_field="context_org"/>
-                               <retrieve permission="STAFF_LOGIN" context_field="context_org"/>
-                               <update permission="ADMIN_REMOTEAUTH" context_field="context_org"/>
-                               <delete permission="ADMIN_REMOTEAUTH" context_field="context_org"/>
+                               <create permission="ADMIN_STUDENT_CARDS" global_required="true"/>
+                               <retrieve permission="ADMIN_STUDENT_CARDS" global_required="true"/>
+                               <update permission="ADMIN_STUDENT_CARDS" global_required="true"/>
+                               <delete permission="ADMIN_STUDENT_CARDS" global_required="true"/>
+                       </actions>
+               </permacrud>
+       </class>
+
+       <class id="scs" controller="open-ils.cstore open-ils.pcrud" oils_obj:fieldmapper="student_card::school" oils_persist:tablename="student_card.school" reporter:label="Student Card School">
+               <fields oils_persist:primary="id">
+                       <field name="id"                reporter:datatype="id"       reporter:label="School ID"/>
+                       <field name="district_id"       reporter:datatype="link"     reporter:label="District Link"/>
+                       <field name="name"              reporter:datatype="text"     reporter:label="School Name"/>
+                       <field name="state_id"          reporter:datatype="int"      reporter:label="State ID"/>
+                       <field name="grades"            reporter:datatype="text"     reporter:label="School Grades"/>
+                       <field name="addr_street_1"     reporter:datatype="text"     reporter:label="School Address Street 1"/>
+                       <field name="addr_street_2"     reporter:datatype="text"     reporter:label="School Address Street 2"/>
+                       <field name="addr_city"         reporter:datatype="text"     reporter:label="School Address City"/>
+                       <field name="addr_county"       reporter:datatype="text"     reporter:label="School Address County"/>
+                       <field name="addr_state"        reporter:datatype="text"     reporter:label="School Address State"/>
+                       <field name="addr_post_code"    reporter:datatype="text"     reporter:label="School Address Postal Code"/>
+                       <field name="eg_perm_group"     reporter:datatype="link"     reporter:label="Permission Profile"/>
+                       <field name="home_ou"           reporter:datatype="link"     reporter:label="Home Library"/>
+               </fields>
+        <links>
+            <link field="district_id" reltype="has_a" key="id" map="" class="scd"/>
+            <link field="eg_perm_group" reltype="has_a" key="id" map="" class="pgt"/>
+            <link field="home_ou" reltype="has_a" key="id" map="" class="aou"/>
+        </links>
+               <permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
+                       <actions>
+                               <create permission="ADMIN_STUDENT_CARDS" global_required="true"/>
+                               <retrieve permission="ADMIN_STUDENT_CARDS" global_required="true"/>
+                               <update permission="ADMIN_STUDENT_CARDS" global_required="true"/>
+                               <delete permission="ADMIN_STUDENT_CARDS" global_required="true"/>
                        </actions>
                </permacrud>
        </class>

diff --git a/Open-ILS/src/sql/Pg/600.schema.student_card.sql b/Open-ILS/src/sql/Pg/600.schema.student_card.sql
index e05a47d..98f1a4a 100644 (file)
--- a/Open-ILS/src/sql/Pg/600.schema.student_card.sql
+++ b/Open-ILS/src/sql/Pg/600.schema.student_card.sql
@@ -1,5 +1,7 @@
 BEGIN;
 
+DROP SCHEMA student_card CASCADE;
+
 CREATE SCHEMA student_card;
 
 CREATE TABLE student_card.district (

diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.student_cards.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.student_cards.sql
index 3e491e1..0d02503 100644 (file)
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.student_cards.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.student_cards.sql
@@ -19,7 +19,7 @@ CREATE TABLE student_card.district (
 CREATE TABLE student_card.school (
     id                  SERIAL PRIMARY KEY,
     district_id         INTEGER NOT NULL REFERENCES student_card.district (id),
-    name                TEXT NOT NULL,
+    name                TEXT NOT NULL UNIQUE,
     state_id            INTEGER NOT NULL, -- school ID per the State of Georgia
     grades              TEXT,
     addr_street_1       TEXT,