summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xdwsim_flowsheet.module72
-rwxr-xr-xmanage_proposal.inc5
-rwxr-xr-xpdf/list_mentor_certificates.inc3
-rwxr-xr-xpdf/mentor_cert_pdf.inc12
-rwxr-xr-xpdf/verify_certificates.inc20
-rwxr-xr-xproposal.inc6
6 files changed, 32 insertions, 86 deletions
diff --git a/dwsim_flowsheet.module b/dwsim_flowsheet.module
index b8fd56b..58130ce 100755
--- a/dwsim_flowsheet.module
+++ b/dwsim_flowsheet.module
@@ -173,16 +173,6 @@ function dwsim_flowsheet_menu()
'weight' => 2,
'file' => 'bulk_approval.inc'
);
- /*$items['dwsim_flowsheet/code_approval/dependency'] = array(
- 'title' => 'Dependency',
- 'description' => 'Dependency Mangage',
- 'page callback' => 'drupal_get_form',
- 'page arguments' => array('dwsim_flowsheet_dependency_approval_form'),
- 'access arguments' => array('dwsim flowsheet bulk manage abstract'),
- 'type' => MENU_LOCAL_TASK,
- 'weight' => 3,
- 'file' => 'dependency_approval.inc',
- );*/
$items['flowsheeting-project/code-approval/upload'] = array(
'title' => 'Upload Code',
'description' => 'Admin Upload',
@@ -247,16 +237,6 @@ function dwsim_flowsheet_menu()
'file' => 'upload_code.inc',
'weight' => 2
);
- /* $items['dwsim_flowsheet/code/upload_dep'] = array(
- 'title' => 'Upload Dependency',
- 'description' => 'Upload Dependency Files',
- 'page callback' => 'drupal_get_form',
- 'page arguments' => array('dwsim_flowsheet_upload_dependency_form'),
- 'access arguments' => array('dwsim flowsheet upload code'),
- 'type' => MENU_LOCAL_TASK,
- 'file' => 'dependency.inc',
- 'weight' => 3,
- );*/
$items['flowsheeting-project/abstract-code/delete'] = array(
'title' => 'Delete Solution',
'description' => 'Delete Solution',
@@ -278,14 +258,6 @@ function dwsim_flowsheet_menu()
'type' => MENU_CALLBACK,
'file' => 'download.inc'
);
- /*$items['dwsim_flowsheet/download/dependency'] = array(
- 'title' => 'Code Download',
- 'description' => 'Code Download',
- 'page callback' => 'dwsim_flowsheet_download_dependency_file',
- 'access arguments' => array('dwsim flowsheet download code'),
- 'type' => MENU_CALLBACK,
- 'file' => 'download.inc',
- );*/
$items['flowsheeting-project/download/solution'] = array(
'title' => 'Code Download',
'description' => 'Code Download',
@@ -377,27 +349,6 @@ function dwsim_flowsheet_menu()
'type' => MENU_CALLBACK,
'file' => 'download.inc'
);
- /*$items['dwsim_flowsheet_run'] = array(
- 'title' => 'Download Codes',
- 'page callback' => 'drupal_get_form',
- 'page arguments' => array('dwsim_flowsheet_run_form_ajax'),
- 'access arguments' => array('access content'),
- 'type' => MENU_NORMAL_ITEM,
- 'file' => 'run.inc',
- );
- $items['dwsim_flowsheet_run_ajax'] = array(
- 'page callback' => 'dwsim_flowsheet_run_ajax',
- 'access callback' => TRUE,
- 'file' => 'run.inc',
- );
- $items['download_codes'] = array(
- 'title' => 'Download Codes',
- 'page callback' => 'drupal_get_form',
- 'page arguments' => array('dwsim_flowsheet_run_form_ajax'),
- 'access arguments' => array('access content'),
- 'type' => MENU_NORMAL_ITEM,
- 'file' => 'run.inc',
- );*/
/* LATEX SCRIPT */
$items['flowsheeting-project/generate-lab'] = array(
'title' => 'Generate Lab',
@@ -465,7 +416,7 @@ function dwsim_flowsheet_menu()
),
'file' => 'pdf/cert_new.inc'
);
- $items['flowsheeting-project/certificates_custom'] = array(
+ $items['flowsheeting-project/certificates-custom'] = array(
'title' => 'List of Flowsheet Custom Certificates',
'description' => 'List of flowsheet Custom Certificates',
'page callback' => '_list_flowsheet_custom_certificates',
@@ -474,7 +425,7 @@ function dwsim_flowsheet_menu()
),
'file' => 'pdf/list_mentor_certificates.inc'
);
- $items['flowsheeting-project/certificates_custom/pdf'] = array(
+ $items['flowsheeting-project/certificates-custom/pdf'] = array(
'title' => 'Download Certificate',
'description' => 'Download Certificate',
'page callback' => 'drupal_get_form',
@@ -496,22 +447,6 @@ function dwsim_flowsheet_menu()
'type' => MENU_CALLBACK,
'file' => 'pdf/verify_certificates.inc'
);
- /*$items["flowsheeting-project/certificates_custom/verify"] = array(
- "title" => "Certificate Verification",
- "page callback" => "verify_custom_certificates",
- "access arguments" => array(
- "verify certificates"
- ),
- 'type' => MENU_CALLBACK,
- 'file' => 'pdf/verify_certificates.inc'
- );
- /* $items["dwsim_flowsheet/code_approval/dependency/ajax"] = array(
- "title" => "Ajax callbacks",
- "page callback" => "dwsim_flowsheet_dependency_approval_ajax",
- "access arguments" => array("dwsim flowsheet bulk manage abstract"),
- "type" => MENU_CALLBACK,
- 'file' => 'dependency_approval.inc',
- );*/
return $items;
}
/**
@@ -868,9 +803,8 @@ function _df_dir_name($project, $proposar_name)
$project_title = ucname($project);
$proposar_name = ucname($proposar_name);
$dir_name = $project_title . ' By ' . $proposar_name;
- $directory_name = str_replace("__", "_", str_replace(" ", "_", $dir_name));
+ $directory_name = str_replace("__", "_", str_replace(" ", "_", str_replace("/", " ", $dir_name)));
return $directory_name;
- //return $directory_name;
}
function dwsim_flowsheet_document_path()
{
diff --git a/manage_proposal.inc b/manage_proposal.inc
index daa846c..0733812 100755
--- a/manage_proposal.inc
+++ b/manage_proposal.inc
@@ -197,6 +197,7 @@ function dwsim_flowsheet_proposal_approval_form($form, &$form_state)
$form['contributor_name'] = array(
'#type' => 'item',
'#markup' => l($proposal_data->name_title . ' ' . $proposal_data->contributor_name, 'user/' . $proposal_data->uid),
+ '#size' => 250,
'#title' => t('Student name')
);
$form['student_email_id'] = array(
@@ -496,6 +497,7 @@ function dwsim_flowsheet_proposal_status_form($form, &$form_state)
$form['contributor_name'] = array(
'#type' => 'item',
'#markup' => l($proposal_data->name_title . ' ' . $proposal_data->contributor_name, 'user/' . $proposal_data->uid),
+ '#size' => 250,
'#title' => t('Student name')
);
$form['student_email_id'] = array(
@@ -787,7 +789,7 @@ function dwsim_flowsheet_proposal_edit_form($form, &$form_state)
'#type' => 'textfield',
'#title' => t('Name of the Proposer'),
'#size' => 30,
- '#maxlength' => 50,
+ '#maxlength' => 250,
'#required' => TRUE,
'#default_value' => $proposal_data->contributor_name
);
@@ -1044,6 +1046,7 @@ function dwsim_flowsheet_proposal_edit_form_submit($form, &$form_state)
if ($form_state['values']['delete_proposal'] == 1)
{
/* sending email */
+ $user_data = user_load($proposal_data->uid);
$email_to = $user_data->mail;
$from = variable_get('dwsim_flowsheet_from_email', '');
$bcc = variable_get('dwsim_flowsheet_emails', '');
diff --git a/pdf/list_mentor_certificates.inc b/pdf/list_mentor_certificates.inc
index f06efad..971bafc 100755
--- a/pdf/list_mentor_certificates.inc
+++ b/pdf/list_mentor_certificates.inc
@@ -14,7 +14,8 @@ function _list_flowsheet_custom_certificates()
$search_rows = array();
global $output;
$output = '';
- $query3 = db_query("SELECT id,project_guide_name,project_title FROM dwsim_flowsheet_proposal WHERE project_guide_name != '' AND approval_status=3");
+ $query3 = db_query("SELECT id,project_guide_name,project_guide_university,project_title FROM
+dwsim_flowsheet_proposal WHERE project_guide_name != '' AND project_guide_university != '' AND approval_status=3");
$i = 1;
while ($search_data3 = $query3->fetchObject()) {
$search_rows[] = array(
diff --git a/pdf/mentor_cert_pdf.inc b/pdf/mentor_cert_pdf.inc
index 9e097eb..1c59f1a 100755
--- a/pdf/mentor_cert_pdf.inc
+++ b/pdf/mentor_cert_pdf.inc
@@ -88,10 +88,9 @@ function generate_pdf()
$query->condition('proposal_id', $proposal_id);
$result = $query->execute();
$data = $result->fetchObject();
- $DBString = $data->custom_qr_code;
- $qrstring = $data->qr_code;
+ //$DBString = $data->custom_qr_code;
$proposal_get_id = $data->proposal_id;
- if ($DBString == "" || $DBString == "null") {
+ /*if ($DBString == "" || $DBString == "null") {
$UniqueString = generateRandomString();
$query = "UPDATE dwsim_flowsheet_qr_code SET custom_qr_code = :custom_qr_code WHERE proposal_id = :proposal_id";
$args = array(
@@ -104,8 +103,9 @@ function generate_pdf()
} //$DBString == "" || $DBString == "null"
else {
$UniqueString = $DBString;
- }
- $codeContents = 'http://dwsim.fossee-dell/flowsheeting-project/certificates/verify/' . $qrstring;
+ }*/
+ $qrstring = $data->qr_code;
+ $codeContents = 'https://dwsim.fossee.in/flowsheeting-project/certificates/verify/' . $qrstring;
$fileName = 'generated_qrcode.png';
$pngAbsoluteFilePath = $tempDir . $fileName;
$urlRelativeFilePath = $path . "/pdf/temp_prcode/" . $fileName;
@@ -129,7 +129,7 @@ function generate_pdf()
$pdf->SetY(-58);
$pdf->Ln(14);
$pdf->SetX(10);
- $pdf->Cell(0, 0, $UniqueString, 0, 0, 'C');
+ $pdf->Cell(0, 0, $qrstring, 0, 0, 'C');
$pdf->SetX(29);
$pdf->SetY(-50);
$image4 = $path . "/pdf/images/verify_content.png";
diff --git a/pdf/verify_certificates.inc b/pdf/verify_certificates.inc
index fbc4d48..8b71743 100755
--- a/pdf/verify_certificates.inc
+++ b/pdf/verify_certificates.inc
@@ -77,10 +77,19 @@ function verify_qrcode_fromdb($qr_code)
':uid' => $proposal_id
));
$data3 = $query3->fetchObject();
- /*$query3 = db_query("SELECT * FROM {dwsim_flowsheet_proposal} WHERE approval_status=3 AND uid= :uid", array(
- ':uid' => $user->uid
- ));
- $data3 = $query3->fetchObject();**/
+ if($data3->project_guide_name){
+ $page_content = "";
+ $page_content .= "<h4>Participation Details</h4><table><tr><td>Name</td>";
+ $page_content .= "<td>" . $data3->contributor_name . "</td></tr>";
+ $page_content .= "<tr><td>Project</td>";
+ $page_content .= "<td>DWSIM Flowsheeting Project</td></tr>";
+ $page_content .= "<tr><td>Flowsheets completed</td>";
+ $page_content .= "<td>" . $data3->project_title . "</td></tr>";
+ $page_content .= "<tr><td>Project Guide</td>";
+ $page_content .= "<td>" . $data3->project_guide_name . "</td></tr>";
+ $page_content .= "</table>";
+ }
+ else{
$page_content = "";
$page_content .= "<h4>Participation Details</h4><table><tr><td>Name</td>";
$page_content .= "<td>" . $data3->contributor_name . "</td></tr>";
@@ -88,9 +97,8 @@ function verify_qrcode_fromdb($qr_code)
$page_content .= "<td>DWSIM Flowsheeting Project</td></tr>";
$page_content .= "<tr><td>Flowsheets completed</td>";
$page_content .= "<td>" . $data3->project_title . "</td></tr>";
- //$page_content .= "<tr><td>Book Author</td>";
- //$page_content .= "<td>" . $data2->author . "</td></tr>";
$page_content .= "</table>";
+ }
} //$proposal_id
else
{
diff --git a/proposal.inc b/proposal.inc
index 22bcc53..30836b5 100755
--- a/proposal.inc
+++ b/proposal.inc
@@ -254,7 +254,7 @@ function dwsim_flowsheet_proposal_form($form, &$form_state, $no_js_use = FALSE)
$form['reference'] = array(
'#type' => 'textfield',
'#title' => t('Reference'),
- '#size' => 250,
+ '#maxsize' => 250,
'#required' => TRUE,
'#attributes' => array(
'placeholder' => 'Enter reference'
@@ -523,8 +523,8 @@ function dwsim_flowsheet_proposal_form_validate($form, &$form_state)
form_set_error('project_title', t('Minimum charater limit is 10 charaters, please check the length of the project title'));
}
- else if(preg_match('/[\/^£$%&*()}{@#~?><>,|=_+¬]/', $form_state['values']['project_title']))
- form_set_error('project_title', t('Special characters aree not allowed for project title'));
+ else if(preg_match('/[\^£$%&*()}{@#~?><>.:;`|=_+¬]/', $form_state['values']['project_title']))
+ form_set_error('project_title', t('Special characters are not allowed for project title'));
//strlen($form_state['values']['project_title']) < 10
} //$form_state['values']['project_title'] != ''
else
generated by cgit (git 2.34.1) at 2025-02-26 16:32:31 +0000