From 054d7a786c646f9860ef8c4107455740884673af Mon Sep 17 00:00:00 2001
From: Chris Sharp <csharp@georgialibraries.org>
Date: Mon, 9 Nov 2020 09:30:02 -0500
Subject: [PATCH] beginnings

Signed-off-by: Chris Sharp <csharp@georgialibraries.org>
---
 Open-ILS/examples/fm_IDL.xml                    | 71 +++++++------------------
 Open-ILS/src/sql/Pg/600.schema.student_card.sql |  2 -
 2 files changed, 18 insertions(+), 55 deletions(-)

diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index 6739973109..14736ace98 100644
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -13897,68 +13897,34 @@ SELECT  usr,
 	</class>
 
 	<class id="scd" controller="open-ils.cstore open-ils.pcrud" oils_obj:fieldmapper="student_card::district" oils_persist:tablename="student_card.district" reporter:label="Student Card School District">
-		<fields oils_persist:primary="id" oils_persist:sequence="student_card.district_id_seq">
+		<fields oils_persist:primary="id">
 			<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="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="file_dir"          reporter:datatype="text"     reporter:label="Incoming File Directory"/>
-			<field name="exceptions_dir"    reporter:datatype="text"     reporter:label="Exceptions Directory"/>
-		</fields>
-		<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>
-
-	<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" oils_persist:sequence="student_card.school_id_seq">
-			<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"/>
+			<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="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="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>
+		<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_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"/>
+				<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"/>
 			</actions>
 		</permacrud>
 	</class>
 
-<!-- CREATE TABLE student_card.import (
-    id                  SERIAL PRIMARY KEY,
-    import_time         TIMESTAMPTZ NOT NULL DEFAULT NOW(),
-    district_id         INTEGER NOT NULL REFERENCES student_card.district (id),
-    filename            TEXT,
-    error_message       TEXT
-);
-
--->
-
 	<class id="sci" controller="open-ils.cstore open-ils.pcrud" oils_obj:fieldmapper="student_card::import" oils_persist:tablename="student_card.import" reporter:label="Student Card Import">
 		<fields oils_persist:primary="id">
 			<field name="id"                reporter:datatype="id"       reporter:label="Import ID"/>
@@ -13979,7 +13945,6 @@ SELECT  usr,
 		</permacrud>
 	</class>
 
-
 	<!-- ********************************************************************************************************************* -->
 </IDL>
 
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 24b703315c..e05a47dc24 100644
--- a/Open-ILS/src/sql/Pg/600.schema.student_card.sql
+++ b/Open-ILS/src/sql/Pg/600.schema.student_card.sql
@@ -1,7 +1,5 @@
 BEGIN;
 
-DROP SCHEMA IF EXISTS student_card CASCADE;
-
 CREATE SCHEMA student_card;
 
 CREATE TABLE student_card.district (
-- 
2.11.0