Skip to content

Add function and link for revise questionnaires with reload precedent… #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
merluxx wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Add function and link for revise questionnaires with reload precedent… #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4cca7af
Add function and link for revise questionnaires with reload precedent…
May 11, 2026
5530c37
Modifying the questionnaire review function to avoid resetting the PH…
May 28, 2026
81f0ca3
Remove unnecessary function reload_session_from_database
Jun 2, 2026
4005ba3
Added display of the uploaded file name in the list of forms to reche…
Jun 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
.idea
.venv
83 changes: 45 additions & 38 deletions admin/listforms.php
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?php

/* Copyright Australian Consortium for Social and Political Research Incorporated (ACSPRI) 2009
* Written by Adam Zammit - adam.zammit@acspri.org.au
* For ACSPRI: http://www.acspri.org.au/
Expand All @@ -21,8 +20,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
*/


include_once("../config.inc.php");
include_once("../db.inc.php");
include("../functions/functions.database.php");
Expand All @@ -35,54 +32,66 @@

$db->StartTrans();

$sql = "DELETE FROM formboxverifychar
WHERE fid = '$fid'
AND vid = '$vid'";
if (isset($_GET['revise'])) {
$sql = "UPDATE forms
SET assigned_vid = '$vid', done = 4
WHERE fid = '$fid'";
$db->Execute($sql);
// set vid=0 for delete old data on verifyjs.php->complete
$sql2 = "UPDATE formboxverifychar
SET vid = 0
WHERE fid = '$fid'";
$db->Execute($sql2);
$sql3 = "UPDATE formboxverifytext
SET vid = 0
WHERE fid = '$fid'";
$db->Execute($sql3);
} else {
$sql = "DELETE FROM formboxverifychar
WHERE fid = '$fid'
AND vid = '$vid'";
$db->Execute($sql);

$sql = "DELETE FROM formboxverifytext
WHERE fid = '$fid'
AND vid = '$vid'";
$db->Execute($sql);

$db->Execute($sql);

$sql = "DELETE FROM formboxverifytext
WHERE fid = '$fid'
AND vid = '$vid'";

$db->Execute($sql);

$sql = "UPDATE forms
SET assigned_vid = NULL, done = 0, rpc_id = NULL, assigned = NULL, completed = NULL
WHERE fid = '$fid'";

$db->Execute($sql);
$sql = "UPDATE forms
SET assigned_vid = NULL, done = 0, rpc_id = NULL, assigned = NULL, completed = NULL
WHERE fid = '$fid'";
$db->Execute($sql);
}

$db->CompleteTrans();
$db->CompleteTrans();
}

xhtml_head(T_("Listing of forms"),true,array("../css/table.css"));


if (isset($_GET['qid']))
{
$qid = intval($_GET['qid']);
$qid = intval($_GET['qid']);

$sql = "SELECT f.fid, v.description as name, q.description as quest, f.description as scan, CONCAT('<a href=\"?qid=$qid&amp;fid=', f.fid ,'&amp;vid=', f.assigned_vid ,'\">" . T_("Re verify") . "</a>') as link, CONCAT('<a href=\"?revise&amp;qid=$qid&amp;fid=', f.fid ,'&amp;vid=', f.assigned_vid ,'\">" . T_("Revise") . "</a>') as linkrevise
FROM forms as f
JOIN questionnaires AS q ON (f.qid = q.qid AND q.qid = '$qid')
LEFT JOIN verifiers AS v ON (v.vid = f.assigned_vid)
WHERE f.done = 1
ORDER BY f.fid ASC";

$sql = "SELECT f.fid, v.description as name, q.description as quest, CONCAT('<a href=\"?qid=$qid&amp;fid=', f.fid ,'&amp;vid=', f.assigned_vid ,'\">" . T_("Re verify") . "</a>') as link
FROM forms as f
JOIN questionnaires AS q ON (f.qid = q.qid AND q.qid = '$qid')
LEFT JOIN verifiers AS v ON (v.vid = f.assigned_vid)
WHERE f.done = 1
ORDER BY f.fid ASC";

$fs = $db->GetAll($sql);
$fs = $db->GetAll($sql);

print "<div><a href=\"?\">" . T_("Go back") . "</a>";
print "<div><a href=\"?\">" . T_("Go back") . "</a>";

xhtml_table($fs,array('fid','name','quest','link'),array(T_('Form ID'),T_('Operator'),T_('Questionnaire'),T_('Re verify')));
xhtml_table($fs,array('fid','name','quest','scan','link','linkrevise'),array(T_('Form ID'),T_('Operator'),T_('Questionnaire'),T_('Uploaded file'),T_('Re verify'),T_('Revise')));
}
else
{
//print available questionnaires
//print available questionnaires
$sql = "SELECT qid,description
FROM questionnaires
ORDER BY qid DESC";
FROM questionnaires
ORDER BY qid DESC";

$qs = $db->GetAll($sql);

foreach($qs as $q)
Expand All @@ -91,7 +100,5 @@
}
}


xhtml_foot();

?>
125 changes: 46 additions & 79 deletions functions/functions.database.php
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?php

/* Copyright Deakin University 2007,2008
* Written by Adam Zammit - adam.zammit@deakin.edu.au
* For the Deakin Computer Assisted Research Facility: http://www.deakin.edu.au/dcarf/
Expand All @@ -21,9 +20,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
*/



include_once(dirname(__FILE__).'/../config.inc.php');
include_once(dirname(__FILE__).'/../db.inc.php');

Expand Down Expand Up @@ -53,14 +49,10 @@ function sort_order_pageid_box($qid)
$sql = "UPDATE boxgroupstype
SET sortorder = '$i'
WHERE bgid = '{$row['bgid']}'";

$db->Execute($sql);

$i++;
}

$db->CompleteTrans();

}

/* Sort box groups by their variable name
Expand All @@ -70,15 +62,12 @@ function sort_order_varname($qid)
{
global $db;


$db->StartTrans();

$sql = "SELECT b.bgid as bgid
FROM `boxgroupstype` AS b, pages AS p
WHERE p.qid = '$qid'
AND b.pid = p.pid
ORDER BY b.varname ASC";

$all = $db->GetAll($sql);

$i = 0;
Expand All @@ -87,29 +76,22 @@ function sort_order_varname($qid)
$sql = "UPDATE boxgroupstype
SET sortorder = '$i'
WHERE bgid = '{$row['bgid']}'";

$db->Execute($sql);

$i++;
}

$db->CompleteTrans();

}


/*
* Assign the next free form to a verifier
*/

function assign_to($vid)
{
global $db;

$db->StartTrans();

//only assign a form if none currently assigned
//
$sql = "SELECT f.fid as fid
FROM forms as f
WHERE f.done IN (0,2,3)
Expand All @@ -130,61 +112,64 @@ function assign_to($vid)
}
}

$fid = false;
$fid = false;

//check for supervisor forms first

$sql = "SELECT f.fid AS fid
FROM forms AS f
JOIN supervisorquestionnaire AS v ON (v.vid = '$vid' AND f.qid = v.qid) ";

$sql .= " WHERE f.done =2
AND f.assigned_vid IS NULL ";

$sql .= " ORDER BY f.fid ASC LIMIT 1";

$sql .= " ORDER BY f.fid ASC LIMIT 1";
$rs = $db->GetRow($sql);

if (empty($rs))

//check for revise forms second
$sql = "SELECT f.fid AS fid
FROM forms AS f
WHERE f.done = 4 AND f.assigned_vid = '$vid'
ORDER BY f.fid ASC LIMIT 1";
$rs = $db->GetRow($sql);
if (!empty($rs))
{
//only get forms that are assigned to this verifier

$sql = "SELECT f.fid AS fid
FROM forms AS f
JOIN verifierquestionnaire AS v ON (v.vid = '$vid' AND f.qid = v.qid) ";

if (!MISSING_PAGE_ASSIGN){
$sql .= " LEFT JOIN missingpages AS m ON (f.fid = m.fid) ";
}
print T_("Revise forms fid=");
print($rs['fid']);
}
else
{
//only get forms that are assigned to this verifier
$sql = "SELECT f.fid AS fid
FROM forms AS f
JOIN verifierquestionnaire AS v ON (v.vid = '$vid' AND f.qid = v.qid) ";

$sql .= " WHERE ((f.done =0
AND f.assigned_vid IS NULL) OR
(f.done = 3 AND f.assigned_vid IS NULL AND f.assigned_vid2 != '$vid')
) ";
if (!MISSING_PAGE_ASSIGN){
$sql .= " LEFT JOIN missingpages AS m ON (f.fid = m.fid) ";
}

if (!MISSING_PAGE_ASSIGN) {
$sql .= " AND m.fid IS NULL ";
}
$sql .= " WHERE ((f.done = 0 AND f.assigned_vid IS NULL) OR
(f.done = 3 AND f.assigned_vid IS NULL AND f.assigned_vid2 != '$vid')) ";

if (!VERIFY_WITH_MISSING_PAGES)
{
$sql .= "AND NOT EXISTS(
SELECT p.pid
FROM pages AS p
WHERE p.qid = f.qid
AND NOT EXISTS
(SELECT fp.fid
FROM formpages AS fp
WHERE fp.fid = f.fid
AND fp.pid = p.pid))";
}
if (!MISSING_PAGE_ASSIGN) {
$sql .= " AND m.fid IS NULL ";
}

$sql .= " ORDER BY f.done,f.fid ASC
LIMIT 1";
if (!VERIFY_WITH_MISSING_PAGES)
{
$sql .= "AND NOT EXISTS(
SELECT p.pid
FROM pages AS p
WHERE p.qid = f.qid
AND NOT EXISTS
(SELECT fp.fid
FROM formpages AS fp
WHERE fp.fid = f.fid
AND fp.pid = p.pid))";
}

$sql .= " ORDER BY f.done,f.fid ASC LIMIT 1";
//var_dump($sql);exit();

$rs = $db->GetRow($sql);
}
$rs = $db->GetRow($sql);
}

if (!empty($rs))
{
Expand All @@ -207,8 +192,6 @@ function assign_to($vid)

}



function assign_to_merge($vid)
{
global $db;
Expand All @@ -235,12 +218,8 @@ function assign_to_merge($vid)
$db->CompleteTrans();

return $fid;

}




function get_vid()
{
global $db;
Expand All @@ -257,11 +236,8 @@ function get_vid()
{
return $rs['vid'];
}


}


function get_fid($vid = "")
{
global $db;
Expand All @@ -271,7 +247,7 @@ function get_fid($vid = "")
$sql = "SELECT fid
FROM forms
WHERE assigned_vid = '$vid'
AND done IN (0,2,3)";
AND done IN (0,2,3,4)";

$rs = $db->GetRow($sql);

Expand All @@ -288,10 +264,8 @@ function get_fid($vid = "")
}
}
return false;

}


function detect_differences()
{
global $db;
Expand Down Expand Up @@ -341,27 +315,20 @@ function detect_differences()
print_r($diff);
print "<br/>";
}

}

}



function get_qid_description($fid)
{
global $db;

$sql = "SELECT f.qid,f.description,q.double_entry
FROM `forms` as f, questionnaires as q
WHERE f.fid = '$fid'
AND q.qid = f.qid";
WHERE f.fid = '$fid'
AND q.qid = f.qid";

$rs = $db->GetRow($sql);

return $rs;
}



?>
Loading