Track who gets results printed

database/procedures/ag_get_print_results.sql

@@ -0,0 +1,16 @@
+reate or replace procedure ag_get_print_results(
+   kit_id_  in varchar2,
+   results_ in out types.ref_cursor
+)as 
+begin
+  open results_ for 
+  select print_results from ag_handout_kits 
+  where kit_id = kit_id_;
+end ag_get_print_results;
+
+
+/*
+variable user_data_ REFCURSOR;
+execute ag_get_print_results('test_kit', :user_data_);
+print user_data_;
+*/

database/procedures/ag_insert_kit.sql

@@ -4,14 +4,15 @@ create or replace procedure ag_insert_kit
     kit_id_ varchar2, 
     kit_password_ varchar2, 
     swabs_per_kit_ varchar2, 
-    kit_verification_code_ varchar2
+    kit_verification_code_ varchar2,
+    print_results_ varchar2
 )
 as
 begin
 
   insert    into ag_kit
-            (ag_login_id, supplied_kit_id, kit_password, swabs_per_kit, kit_verification_code)
-  values    (ag_login_id_, kit_id_, kit_password_, swabs_per_kit_, kit_verification_code_);
+            (ag_login_id, supplied_kit_id, kit_password, swabs_per_kit, kit_verification_code, print_results)
+  values    (ag_login_id_, kit_id_, kit_password_, swabs_per_kit_, kit_verification_code_, print_results_);
 
   commit;
 

database/queries/updateissue675.sql

@@ -0,0 +1,11 @@
+alter table ag_kit add print_results varchar(1) default ('n');
+alter table ag_handout_kits add print_results varchar(1) default('n');
+update ag_handout_kits set print_results = 'y';
+update ag_handout_kits set print_results = 'n' where kit_id like 'ts_%';
+update ag_handout_kits set print_results = 'n' where kit_id like 'pgp_%';
+commit;
+
+update ag_kit set print_results = 'y';
+update ag_kit set print_results = 'n' where SUPPLIED_KIT_ID like 'ts_%';
+update ag_kit set print_results = 'n' where SUPPLIED_KIT_ID like 'pgp_%';
+commit;

python_code/data_access/ag_data_access.py

@@ -230,17 +230,19 @@ def reassignAGBarcode(self, ag_kit_id, barcode):
         con = self.getMetadataDatabaseConnection()
         con.cursor().callproc('ag_reassign_barcode', [ag_kit_id, barcode])
 
-    def addAGKit(self, ag_login_id, kit_id, kit_password, swabs_per_kit, kit_verification_code):
+    def addAGKit(self, ag_login_id, kit_id, kit_password, swabs_per_kit,
+                 kit_verification_code, printresults='n'):
         """
         return values
         1:  success
         -1: insert failed due to IntegrityError
         """
         con = self.getMetadataDatabaseConnection()
         try:
-            con.cursor().callproc('ag_insert_kit', [ag_login_id, kit_id, 
-                                  kit_password, swabs_per_kit, 
-                                  kit_verification_code])
+            con.cursor().callproc('ag_insert_kit', [ag_login_id, kit_id,
+                                  kit_password, swabs_per_kit,
+                                  kit_verification_code,
+                                  printresults])
         except cx_Oracle.IntegrityError:
             return -1
         return 1
@@ -676,6 +678,7 @@ def handoutCheck(self, username, password):
 
         return is_handout.strip()
 
+
     def checkBarcode(self, barcode):
         # return a tuple consists of:
         # site_sampled, sample_date, sample_time, participant_name,
@@ -776,3 +779,12 @@ def getBarcodesByKit(self, kitID):
         barcodes = [row[0] for row in results]
         return barcodes
 
+    def checkPrintResults(self, kit_id):
+        con = self.getMetadataDatabaseConnection()
+        results = con.cursor()
+        con.cursor().callproc('ag_get_print_results', [kit_id, results])
+        print_results = results.fetchone()
+        if print_results is None:
+            return None
+        else:
+            return print_results[0].strip()

www/americangut/add_participant.psp

@@ -43,8 +43,12 @@ sql = "select cast(ag_login_id as varchar2(100)) from ag_login where email = '{0
 ag_login_id = ag_data_access.dynamicMetadataSelect(sql).fetchone()[0]
 sql = "select swabs_per_kit, verification_code from ag_handout_kits where kit_id = '{0}'".format(kit_id)
 swabs_per_kit, kit_verification_code = ag_data_access.dynamicMetadataSelect(sql).fetchone()
+printresults = ag_data_access.checkPrintResults(kit_id)
+if printresults is None:
+    printresults = 'n'
 success = ag_data_access.addAGKit(ag_login_id, kit_id, password,
-                                  swabs_per_kit, kit_verification_code)
+                                  swabs_per_kit, kit_verification_code,
+                                  printresults)
 if success == -1:
     psp.redirect('db_error.psp?msg=regkit')
 

www/americangut/register_user.psp

@@ -21,6 +21,7 @@ from qiime.parse import parse_mapping_file
 kit_id = form['username']
 password = form['password']
 
+
 tiny_markers = False
 portal_type = 'americangut'