arman/science-ation
1
1
Fork 0
forked from science-ation/science-ation
Code Pull Requests Activity

Implement project\/view

Browse Source
This commit is contained in:
james 2011-02-18 16:56:35 +00:00
parent 340a45127b
commit 96f36d4681
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
api.php
View File

@ -921,6 +921,23 @@ switch($request[0]) {
/* APIDOC: project/view
description(Displays the current project information. project array: project_id integer, projectdivisions_id integer, title varchar(255), language char(2), req_electricity enum('no', 'yes'), req_table enum('no', 'yes'), req_special varchar(128), summary text)
return(project array)
*/
case 'view':
if($u=user_load($_SESSION['users_id'])) {
$p=getProject(getRegistrationsId($_SESSION['users_id']));
if(is_array($p)) {
$ret['status'] = 'ok';
$ret['project'] = $p;
}
else {
$ret['status'] = 'error';
$ret['error'] = 'no project';
}
break;
/* APIDOC: project/edit /* APIDOC: project/edit
post(project array) post(project array)
description(Edit an existing project. "language" notes the language a participant wishes to be judged in. "req_electricity" notes whethor or not the project requires an electrical outlet. "req_table" states whether or not the project needs a table. "req_special" is a field for special requirements. project array: project_id integer, projectdivisions_id integer, title varchar(255), language char(2), req_electricity enum('no', 'yes'), req_table enum('no', 'yes'), req_special varchar(128), summary text) description(Edit an existing project. "language" notes the language a participant wishes to be judged in. "req_electricity" notes whethor or not the project requires an electrical outlet. "req_table" states whether or not the project needs a table. "req_special" is a field for special requirements. project array: project_id integer, projectdivisions_id integer, title varchar(255), language char(2), req_electricity enum('no', 'yes'), req_table enum('no', 'yes'), req_special varchar(128), summary text)
@ -938,7 +955,7 @@ switch($request[0]) {
if($message == 'success'){ if($message == 'success'){
$ret['status'] = 'ok'; $ret['status'] = 'ok';
//FIXME: this should getProject or something to reload whats actually in the database instead of just returning what they gave us //FIXME: this should getProject or something to reload whats actually in the database instead of just returning what they gave us
$ret['project'] = json_encode($project); $ret['project'] = $project;
}else{ }else{
$ret['status'] = 'error'; $ret['status'] = 'error';
$ret['error'] = $message; $ret['error'] = $message;

6
register_participants.inc.php
View File

@ -664,8 +664,7 @@ function getProject($registrations_id){
'registrations_id', 'req_table', 'req_special', 'summary' 'registrations_id', 'req_table', 'req_special', 'summary'
)); ));
$q = mysql_query("SELECT $fields FROM projects WHERE registrations_id='$registrations_id' AND conferences_id='".$conference['id']."' LIMIT 1"); $q = mysql_query("SELECT $fields FROM projects WHERE registrations_id='$registrations_id' AND conferences_id='".$conference['id']."' LIMIT 1");
$returnval = mysql_error(); if(mysql_error()) {
if($returnval){
$returnval = "register_participants.inc.php::getProject -> " . $returnval; $returnval = "register_participants.inc.php::getProject -> " . $returnval;
}else{ }else{
$returnval = mysql_fetch_assoc($q); $returnval = mysql_fetch_assoc($q);
@ -682,8 +681,7 @@ function addProject($registrations_id){
"); ");
//now query the one we just inserted //now query the one we just inserted
$q = mysql_query("SELECT * FROM projects WHERE registrations_id='$registrations_id' AND conferences_id='{$conference['id']}'"); $q = mysql_query("SELECT * FROM projects WHERE registrations_id='$registrations_id' AND conferences_id='{$conference['id']}'");
$returnval = mysql_error(); if(mysql_error()) {
if($returnval){
$returnval = "register_participants.inc.php::addProject -> " . $returnval; $returnval = "register_participants.inc.php::addProject -> " . $returnval;
}else{ }else{
$returnval = mysql_fetch_assoc($q); $returnval = mysql_fetch_assoc($q);