summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSashi202019-04-04 12:08:08 +0530
committerGitHub2019-04-04 12:08:08 +0530
commit0cbe138b3799593ff063d20ce043ccbc276c67b6 (patch)
treee11844534e3a50afc8cd5357013c384df51be50d
parente6bfb2a65096326f2ec407c9ad12d1e5ba7df1ef (diff)
parent9f21cf74562ec66b0b5699014fc720ac518e34b6 (diff)
downloadDWSIM_lab_migration-0cbe138b3799593ff063d20ce043ccbc276c67b6.tar.gz
DWSIM_lab_migration-0cbe138b3799593ff063d20ce043ccbc276c67b6.tar.bz2
DWSIM_lab_migration-0cbe138b3799593ff063d20ce043ccbc276c67b6.zip
Merge pull request #3 from Sashi20/master
Fix issues in uploading and deleting solutions of the lab
-rwxr-xr-xbulk_approval.inc14
-rwxr-xr-xgeneral_deletion.inc391
-rwxr-xr-xlab_details.inc34
-rwxr-xr-xproposal.inc4
-rwxr-xr-xrun.inc6
-rwxr-xr-xupload_code.inc4
-rwxr-xr-xupload_code_delete.inc1
7 files changed, 209 insertions, 245 deletions
diff --git a/bulk_approval.inc b/bulk_approval.inc
index 39ac9c2..ca3b9ab 100755
--- a/bulk_approval.inc
+++ b/bulk_approval.inc
@@ -392,7 +392,7 @@ function lab_migration_bulk_approval_form_submit($form, &$form_state)
if ($form_state['clicked_button']['#value'] == 'Submit')
{
if ($form_state['values']['lab'])
- lab_migration_del_lab_pdf($form_state['values']['lab']);
+ //lab_migration_del_lab_pdf($form_state['values']['lab']);
if (user_access('lab migration bulk manage code'))
{
$query = db_select('lab_migration_proposal');
@@ -489,6 +489,7 @@ FOSSEE,IIT Bombay', array(
}
elseif (($form_state['values']['lab_actions'] == 3) && ($form_state['values']['lab_experiment_actions'] == 0) && ($form_state['values']['lab_experiment_solution_actions'] == 0))
{
+
if (strlen(trim($form_state['values']['message'])) <= 30)
{
form_set_error('message', t(''));
@@ -574,13 +575,20 @@ FOSSEE,IIT Bombay', array(
if (lab_migration_delete_lab($form_state['values']['lab']))
{
drupal_set_message(t('Dis-Approved and Deleted Entire Lab solutions.'), 'status');
+ $query = db_select('lab_migration_proposal');
+ $query->fields('lab_migration_proposal');
+ $query->condition('id', $form_state['values']['lab']);
+ $proposal_q = $query->execute()->fetchObject();
$query = db_select('lab_migration_experiment');
$query->fields('lab_migration_experiment');
$query->condition('proposal_id', $form_state['values']['lab']);
- $experiment_q = $query->execute()->fetchObject();
- $dir_path = $root_path . $experiment_q->directory_name;
+ $experiment_q = $query->execute();
+ $experiment_data = $experiment_q->fetchObject();
+ $exp_path = $root_path . $proposal_q->directory_name . '/EXP' . $experiment_data->number;
+ $dir_path = $root_path . $proposal_q->directory_name;
if (is_dir($dir_path))
{
+ rmdir($exp_path);
$res = rmdir($dir_path);
if (!$res)
{
diff --git a/general_deletion.inc b/general_deletion.inc
index 2125732..e6a9e04 100755
--- a/general_deletion.inc
+++ b/general_deletion.inc
@@ -1,13 +1,13 @@
<?php
+
/******************************************************************************/
/****************************** DELETION FUNCTIONS ****************************/
/******************************************************************************/
function lab_migration_delete_solution($solution_id)
- {
+{
global $user;
$root_path = lab_migration_path();
$status = TRUE;
- //$solution_q = db_query("SELECT * FROM {lab_migration_solution} WHERE id = %d", $solution_id);
$query = db_select('lab_migration_solution');
$query->fields('lab_migration_solution');
$query->condition('id', $solution_id);
@@ -18,284 +18,225 @@ function lab_migration_delete_solution($solution_id)
drupal_set_message(t('Invalid solution.'), 'error');
return FALSE;
}
- //$experiment_q = db_query("SELECT * FROM {lab_migration_experiment} WHERE id = %d", $solution_data->experiment_id);
- $experiment_q = db_query("SELECT lme.*, lmp.id, lmp.directory_name FROM lab_migration_experiment lme JOIN lab_migration_proposal lmp WHERE lmp.id = lme.proposal_id AND lme.id = :experiment_id",array(':experiment_id' => $solution_data->experiment_id));
+ $query = db_select('lab_migration_experiment');
+ $query->fields('lab_migration_experiment');
+ $query->condition('id', $solution_data->experiment_id);
+ $experiment_q = $query->execute();
$experiment_data = $experiment_q->fetchObject();
+ $query = db_select('lab_migration_proposal');
+ $query->fields('lab_migration_proposal');
+ $query->condition('id', $experiment_data->proposal_id);
+ $proposal_q = $query->execute();
+ $proposal_data = $proposal_q->fetchObject();
if (!$experiment_data)
- {
+ {
drupal_set_message(t('Invalid experiment.'), 'error');
return FALSE;
- }
- /* deleting solution files */
- //$solution_files_q = db_query("SELECT * FROM {lab_migration_solution_files} WHERE solution_id = %d", $solution_id);
- $solution_files_q = db_query("SELECT lmsf.*, lmp.directory_name FROM lab_migration_solution_files lmsf JOIN lab_migration_solution lms JOIN lab_migration_experiment lme JOIN lab_migration_proposal lmp WHERE lms.id = lmsf.solution_id AND lme.id = lms.experiment_id AND lmp.id = lme.proposal_id AND lmsf.id = :solution_id", array(':solution_id' => $solution_id));
- /*$query = db_select('lab_migration_solution_files');
+ }
+ /* deleting solution files */
+ $query = db_select('lab_migration_solution_files');
$query->fields('lab_migration_solution_files');
$query->condition('solution_id', $solution_id);
- $solution_files_q = $query->execute();*/
+ $solution_files_q = $query->execute();
while ($solution_files_data = $solution_files_q->fetchObject())
- {
- if (!file_exists($root_path .$solution_files_data->directory_name. '/'. $solution_files_data->filepath))
- {
- $status = FALSE;
- drupal_set_message(t('Error deleting !file. File does not exists.', array(
- '!file' => $solution_files_data->directory_name. '/' . $solution_files_data->filepath
- )), 'error');
- continue;
- }
- /* removing solution file */
- if (!unlink($root_path . $solution_files_data->directory_name. '/'. $solution_files_data->filepath))
- {
- $status = FALSE;
- drupal_set_message(t('Error deleting !file', array(
- '!file' => $solution_files_data->directory_name. '/' . $solution_files_data->filepath
- )), 'error');
- /* sending email to admins */
+ {
+ $ex_path = $proposal_data->directory_name . '/' . $solution_files_data->filepath;
+ $dir_path = $root_path . $ex_path;
+ if (!file_exists($dir_path))
+ {
+ $status = FALSE;
+ drupal_set_message(t('Error deleting !file. File does not exists.', array('!file' => $dir_path)), 'error');
+ continue;
+ }
+ /* removing solution file */
+ if (!unlink($dir_path))
+ {
+ $status = FALSE;
+ drupal_set_message(t('Error deleting !file', array('!file' => $dir_path)), 'error');
+
+ /* sending email to admins */
$email_to = variable_get('lab_migration_emails', '');
$from = variable_get('lab_migration_from_email', '');
- $bcc = "";
- $cc = variable_get('lab_migration_cc_emails', '');
+ $bcc="";
+ $cc=variable_get('lab_migration_cc_emails', '');
$param['standard']['subject'] = "[ERROR] Error deleting example file";
$param['standard']['body'] = "Error deleting solution files by " . $user->uid . " at " . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] . " :
- solution id : " . $solution_id . "
- file id : " . $solution_files_data->id . "
- file path : " . $solution_files_data->directory_name. '/'. $solution_files_data->filepath . "
- PDF path : " . $PdfStatus;
- $param['standard']['headers'] = array(
- 'From' => $from,
- 'MIME-Version' => '1.0',
- 'Content-Type' => 'text/plain; charset=UTF-8; format=flowed; delsp=yes',
- 'Content-Transfer-Encoding' => '8Bit',
- 'X-Mailer' => 'Drupal',
- 'Cc' => $cc,
- 'Bcc' => $bcc
- );
+ solution id : " . $solution_id . "
+ file id : " . $solution_files_data->id . "
+ file path : " . $solution_files_data->filepath."
+ PDF path : " . $PdfStatus;
+ $param['standard']['headers']=array('From'=>$from,'MIME-Version'=> '1.0',
+ 'Content-Type'=> 'text/plain; charset=UTF-8; format=flowed; delsp=yes',
+ 'Content-Transfer-Encoding' => '8Bit',
+ 'X-Mailer'=> 'Drupal','Cc' => $cc, 'Bcc' => $bcc);
+
if (!drupal_mail('lab_migration', 'standard', $email_to, language_default(), $param, $from, TRUE))
- drupal_set_message('Error sending email message.', 'error');
- }
- else
- {
- /* deleting example files database entries */
- db_delete('lab_migration_solution_files')->condition('id', $solution_files_data->id)->execute();
- }
- }
+ drupal_set_message('Error sending email message.', 'error');
+ }
+ else {
+ /* deleting example files database entries */
+ db_delete('lab_migration_solution_files')->condition('id', $solution_files_data->id)->execute();
+ }
+ }
+
if (!$status)
+ return FALSE;
+ $query = db_select('lab_migration_solution');
+ $query->fields('lab_migration_solution');
+ $query->condition('id', $solution_id);
+ $solution_q = $query->execute();
+ $solution_data = $solution_q->fetchObject();
+ if (!$solution_data)
+ {
+ drupal_set_message(t('Invalid solution.'), 'error');
return FALSE;
- /* removing code folder */
- $ex_path = $experiment_data->directory_name . '/EXP' . $experiment_data->number . '/CODE' . $solution_data->code_number;
- $dir_path = $root_path . $ex_path;
+ }
+ $query = db_select('lab_migration_experiment');
+ $query->fields('lab_migration_experiment');
+ $query->condition('id', $solution_data->experiment_id);
+ $experiment_q = $query->execute();
+ $experiment_data = $experiment_q->fetchObject();
+ $query = db_select('lab_migration_proposal');
+ $query->fields('lab_migration_proposal');
+ $query->condition('id', $experiment_data->proposal_id);
+ $proposal_q = $query->execute();
+ $proposal_data = $proposal_q->fetchObject();
+ $dir_path = $root_path . $proposal_data->directory_name . '/EXP' . $experiment_data->number . '/CODE' . $solution_data->code_number;
if (is_dir($dir_path))
- {
+ {
if (!rmdir($dir_path))
- {
- drupal_set_message(t('Error deleting folder !folder', array(
- '!folder' => $dir_path
- )), 'error');
- /* sending email to admins */
+ {
+ drupal_set_message(t('Error deleting folder !folder', array('!folder' => $dir_path)), 'error');
+
+ /* sending email to admins */
$email_to = variable_get('lab_migration_emails', '');
$from = variable_get('lab_migration_from_email', '');
- $bcc = "";
- $cc = variable_get('lab_migration_cc_emails', '');
+ $bcc="";
+ $cc=variable_get('lab_migration_cc_emails', '');
+
+
$param['standard']['subject'] = "[ERROR] Error deleting folder";
$param['standard']['body'] = "Error deleting folder " . $dir_path . " by " . $user->uid . " at " . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
- $param['standard']['headers'] = array(
- 'From' => $from,
- 'MIME-Version' => '1.0',
- 'Content-Type' => 'text/plain; charset=UTF-8; format=flowed; delsp=yes',
- 'Content-Transfer-Encoding' => '8Bit',
- 'X-Mailer' => 'Drupal',
- 'Cc' => $cc,
- 'Bcc' => $bcc
- );
+ $param['standard']['headers']=array('From'=>$from,'MIME-Version'=> '1.0',
+ 'Content-Type'=> 'text/plain; charset=UTF-8; format=flowed; delsp=yes',
+ 'Content-Transfer-Encoding' => '8Bit',
+ 'X-Mailer'=> 'Drupal','Cc' => $cc, 'Bcc' => $bcc);
+
if (!drupal_mail('lab_migration', 'standard', $email_to, language_default(), $param, $from, TRUE))
drupal_set_message('Error sending email message.', 'error');
- return FALSE;
- }
- }
- else
- {
- drupal_set_message(t('Cannot delete solution folder. !folder does not exists.', array(
- '!folder' => $dir_path
- )), 'error');
+ return FALSE;
+ }
+ }
+ else
+ {
+ drupal_set_message(t('Cannot delete solution folder. !folder does not exists.', array('!folder' => $dir_path)), 'error');
return FALSE;
- }
- /* deleting solution dependency and solution database entries */
+ }
+
+ /* deleting solution dependency and solution database entries */
db_delete('lab_migration_solution_dependency')->condition('solution_id', $solution_id)->execute();
db_delete('lab_migration_solution')->condition('id', $solution_id)->execute();
return $status;
- }
+}
+
function lab_migration_delete_experiment($experiment_id)
- {
+{
$status = TRUE;
$root_path = lab_migration_path();
- //$experiment_q = db_query("SELECT * FROM {lab_migration_experiment} WHERE id = %d", $experiment_id);
$query = db_select('lab_migration_experiment');
$query->fields('lab_migration_experiment');
$query->condition('id', $experiment_id);
$experiment_q = $query->execute();
$experiment_data = $experiment_q->fetchObject();
+ $query = db_select('lab_migration_proposal');
+ $query->fields('lab_migration_proposal');
+ $query->condition('id', $experiment_data->proposal_id);
+ $proposal_q = $query->execute();
+ $proposal_data = $proposal_q->fetchObject();
if (!$experiment_data)
- {
+ {
drupal_set_message('Invalid experiment.', 'error');
return FALSE;
- }
- /* deleting solutions */
- //$solution_q = db_query("SELECT * FROM {lab_migration_solution} WHERE experiment_id = %d", $experiment_id);
+ }
+ /* deleting solutions */
$query = db_select('lab_migration_solution');
$query->fields('lab_migration_solution');
$query->condition('experiment_id', $experiment_id);
$solution_q = $query->execute();
$delete_exp_folder = FALSE;
while ($solution_data = $solution_q->fetchObject())
- {
+ {
$delete_exp_folder = TRUE;
if (!lab_migration_delete_solution($solution_data->id))
- $status = FALSE;
- }
+ $status = FALSE;
+ }
if (!$delete_exp_folder)
- {
+ {
return TRUE;
- }
+ }
if ($status)
- {
- $dir_path = $root_path . $experiment_data->directory_name . '/EXP' . $experiment_data->number;
+ {
+ $dir_path = $root_path . $proposal_data->directory_name . '/EXP' . $experiment_data->number;
if (is_dir($dir_path))
+ {
+ $res = rmdir($dir_path);
+ if (!$res)
{
- $res = rmdir($dir_path);
- if (!$res)
- {
- drupal_set_message(t('Error deleting experiment folder !folder', array(
- '!folder' => $dir_path
- )), 'error');
- /* sending email to admins */
- $email_to = variable_get('lab_migration_emails', '');
- $from = variable_get('lab_migration_from_email', '');
- $bcc = "";
- $cc = variable_get('lab_migration_cc_emails', '');
- $param['standard']['subject'] = "[ERROR] Error deleting experiment folder";
- $param['standard']['body'] = "Error deleting folder " . $dir_path;
- $param['standard']['headers'] = array(
- 'From' => $from,
- 'MIME-Version' => '1.0',
- 'Content-Type' => 'text/plain; charset=UTF-8; format=flowed; delsp=yes',
+ drupal_set_message(t('Error deleting experiment folder !folder', array('!folder' => $dir_path)), 'error');
+ /* sending email to admins */
+ $email_to = variable_get('lab_migration_emails', '');
+ $from = variable_get('lab_migration_from_email', '');
+ $bcc="";
+ $cc=variable_get('lab_migration_cc_emails', '');
+ $param['standard']['subject'] = "[ERROR] Error deleting experiment folder";
+ $param['standard']['body'] = "Error deleting folder " . $dir_path;
+ $param['standard']['headers']=array('From'=>$from,'MIME-Version'=> '1.0',
+ 'Content-Type'=> 'text/plain; charset=UTF-8; format=flowed; delsp=yes',
'Content-Transfer-Encoding' => '8Bit',
- 'X-Mailer' => 'Drupal',
- 'Cc' => $cc,
- 'Bcc' => $bcc
- );
- if (!drupal_mail('lab_migration', 'standard', $email_to, language_default(), $param, $from, TRUE))
- drupal_set_message('Error sending email message.', 'error');
- return FALSE;
- }
- else
- {
- return TRUE;
- }
- }
- else
- {
- drupal_set_message(t('Cannot delete experiment folder. !folder does not exists.', array(
- '!folder' => $dir_path
- )), 'error');
+ 'X-Mailer'=> 'Drupal','Cc' => $cc, 'Bcc' => $bcc);
+ if (!drupal_mail('lab_migration', 'standard', $email_to, language_default(), $param,$from, TRUE))
+ drupal_set_message('Error sending email message.', 'error');
return FALSE;
- }
- }
- return FALSE;
- }
-function lab_migration_delete_lab($lab_id)
- {
- $status = TRUE;
- $root_path = lab_migration_path();
- //$proposal_q = db_query("SELECT * FROM {lab_migration_proposal} WHERE id = %d", $lab_id);
- $query = db_select('lab_migration_proposal');
- $query->fields('lab_migration_proposal');
- $query->condition('id', $lab_id);
- $proposal_q = $query->execute();
- $proposal_data = $proposal_q->fetchObject();
- if (!$proposal_data)
- {
- drupal_set_message('Invalid Lab.', 'error');
- return FALSE;
- }
- /* delete experiments */
- //$experiment_q = db_query("SELECT * FROM {lab_migration_experiment} WHERE proposal_id = %d", $proposal_data->id);
- $query = db_select('lab_migration_experiment');
- $query->fields('lab_migration_experiment');
- $query->condition('proposal_id', $proposal_data->id);
- $experiment_q = $query->execute();
- while ($experiment_data = $experiment_q->fetchObject())
- {
- if (!lab_migration_delete_experiment($experiment_data->id))
+ }
+ else
{
- $status = FALSE;
+ return TRUE;
}
- }
- return $status;
- }
-function lab_migration_del_lab_pdf($lab_id)
+ }
+ else {
+ drupal_set_message(t('Cannot delete experiment folder. !folder does not exists.', array('!folder' => $dir_path)), 'error');
+ return FALSE;
+ }
+ }
+ return FALSE;
+}
+
+function lab_migration_delete_lab($lab_id)
+{
+ $status = TRUE;
+ $root_path = lab_migration_path();
+ $query = db_select('lab_migration_proposal');
+ $query->fields('lab_migration_proposal');
+ $query->condition('id', $lab_id);
+ $proposal_q = $query->execute();
+ $proposal_data = $proposal_q->fetchObject();
+ if (!$proposal_data)
{
- $root_path = lab_migration_path();
- $dir_path = $root_path . "latex/";
- $pdf_filename = "lab_" . $lab_id . ".pdf";
- if (file_exists($dir_path . $pdf_filename))
- unlink($dir_path . $pdf_filename);
+ drupal_set_message('Invalid Lab.', 'error');
+ return FALSE;
}
-function lab_migration_delete_dependency($dependency_id)
+ /* delete experiments */
+ $query = db_select('lab_migration_experiment');
+ $query->fields('lab_migration_experiment');
+ $query->condition('proposal_id', $proposal_data->id);
+ $experiment_q = $query->execute();
+ while ($experiment_data = $experiment_q->fetchObject())
{
- global $user;
- $root_path = lab_migration_path();
- $status = TRUE;
- //$dependency_files_q = db_query("SELECT * FROM {lab_migration_dependency_files} WHERE id = %d", $dependency_id);
- $query = db_select('lab_migration_dependency_files');
- $query->fields('lab_migration_dependency_files');
- $query->condition('id', $dependency_id);
- $dependency_files_q = $query->execute();
- $dependency_files_data = $dependency_files_q->fetchObject();
- if (!$dependency_files_data)
- {
- drupal_set_message(t('Invalid dependency.'), 'error');
- return FALSE;
- }
- if (!file_exists($root_path . $dependency_files_data->filepath))
- {
- drupal_set_message(t('Error deleting !file. File does not exists.', array(
- '!file' => $dependency_files_data->filepath
- )), 'error');
- return FALSE;
- }
- /* removing dependency file */
- if (!unlink($root_path . $dependency_files_data->filepath))
- {
- $status = FALSE;
- drupal_set_message(t('Error deleting !file', array(
- '!file' => $dependency_files_data->filepath
- )), 'error');
- /* sending email to admins */
- $email_to = variable_get('lab_migration_emails', '');
- $from = variable_get('lab_migration_from_email', '');
- $bcc = "";
- $cc = variable_get('lab_migration_cc_emails', '');
- $param['standard']['subject'] = "[ERROR] Error deleting dependency file";
- $param['standard']['body'] = "Error deleting dependency files by " . $user->uid . " at " . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] . " :
- dependency id : " . $dependency_id . "
- file id : " . $dependency_files_data->id . "
- file path : " . $dependency_files_data->filepath;
- $param['standard']['headers'] = array(
- 'From' => $from,
- 'MIME-Version' => '1.0',
- 'Content-Type' => 'text/plain; charset=UTF-8; format=flowed; delsp=yes',
- 'Content-Transfer-Encoding' => '8Bit',
- 'X-Mailer' => 'Drupal',
- 'Cc' => $cc,
- 'Bcc' => $bcc
- );
- if (!drupal_mail('lab_migration', 'standard', $email_to, language_default(), $param, $from, TRUE))
- drupal_set_message('Error sending email message.', 'error');
- }
- else
- {
- /* deleting dependency files database entries */
- db_delete('lab_migration_dependency_files')->condition('id', $dependency_id)->execute();
- }
- return $status;
+ if (!lab_migration_delete_experiment($experiment_data->id))
+ {
+ $status = FALSE;
+ }
}
+ return $status;
+}
+
diff --git a/lab_details.inc b/lab_details.inc
index 0c9d07f..b04986e 100755
--- a/lab_details.inc
+++ b/lab_details.inc
@@ -18,12 +18,12 @@ function lab_migration_completed_labs_all()
$i = 1;
while ($row = $result->fetchObject())
{
- $approval_date = date("Y", $row->approval_date);
+ $completion_date = date("Y", $row->expected_completion_date);
$preference_rows[] = array(
$i,
$row->university,
- l($row->lab_title, "lab-migration/lab-migration-run/" . $row->id),
- $approval_date
+ $row->lab_title,
+ $completion_date
);
$i++;
}
@@ -55,15 +55,29 @@ function lab_migration_labs_progress_all()
}
else
{
- //$result = db_query($query);
- $page_content .= "<ol>";
+ $preference_rows = array();
+ $i = 1;
while ($row = $result->fetchObject())
{
- $page_content .= "<li>";
- $page_content .= $row->university . " ({$row->lab_title})";
- $page_content .= "</li>";
+ $approval_date = date("Y", $row->approval_date);
+ $preference_rows[] = array(
+ $i,
+ $row->university,
+ $row->lab_title,
+ $approval_date
+ );
+ $i++;
}
- $page_content .= "</ol>";
+ $preference_header = array(
+ 'No',
+ 'Institute',
+ 'Lab',
+ 'Year'
+ );
+ $page_content .= theme('table', array(
+ 'header' => $preference_header,
+ 'rows' => $preference_rows
+ ));
}
return $page_content;
- }
+ } \ No newline at end of file
diff --git a/proposal.inc b/proposal.inc
index af5fcd0..d7b6fde 100755
--- a/proposal.inc
+++ b/proposal.inc
@@ -225,7 +225,7 @@ function lab_migration_proposal_form($form, &$form_state)
$first_experiemnt = TRUE;
for ($counter = 1; $counter <= 15; $counter++)
{
- if ($counter <= 5)
+ if ($counter <= 1)
{
$form['lab_experiment-' . $counter] = array(
'#type' => 'textfield',
@@ -576,7 +576,7 @@ function _lm_list_of_software_version()
function _lm_dir_name($lab, $name, $university)
{
$lab_title = ucname($lab);
- $proposar_name = ucname($lab);
+ $proposar_name = ucname($name);
$university_name = ucname($university);
$dir_name = $lab_title . " " . "by". " " . $proposar_name . ' ' . $university_name;
$directory_name = str_replace("__", "_", str_replace(" ", "_", $dir_name));
diff --git a/run.inc b/run.inc
index 4ad250b..2ba4a44 100755
--- a/run.inc
+++ b/run.inc
@@ -120,13 +120,13 @@ function lab_migration_run_form($form, &$form_state)
'#markup' => '<div id="ajax_selected_lab_pdf">'. l('Download PDF of Lab Solutions', 'lab-migration/generate-lab/' . $lab_default_value . '/1') .'</div>',
);*/
- if ($lab_default_value == '2')
+ /*if ($lab_default_value == '2')
{
$form['selected_lab_dwsim'] = array(
'#type' => 'item',
'#markup' => '<div id="ajax_selected_lab_dwsim">' . l('Download Lab Solutions (dwsim Version)', 'lab-migration-uploads/dwsim_Version.zip') . '</div>'
);
- }
+ }*/
$form['lab_details'] = array(
'#type' => 'item',
'#markup' => '<div id="ajax_lab_details">' . _lab_details($lab_default_value) . '</div>'
@@ -223,7 +223,7 @@ function ajax_experiment_list_callback($form, $form_state)
if ($lab_details->solution_provider_uid > 0)
{
$commands[] = ajax_command_html('#ajax_selected_lab', l('Download Lab Solutions', 'lab-migration/download/lab/' . $lab_default_value));
- if ($lab_default_value == '2')
+ /*if ($lab_default_value == '2')
{
$commands[] = ajax_command_html('#ajax_selected_lab_dwsim', l('Download Lab Solutions (dwsim Version)', 'lab-migration_uploads/dwsim_Version.zip'));
}
diff --git a/upload_code.inc b/upload_code.inc
index bced2f5..4dafe6c 100755
--- a/upload_code.inc
+++ b/upload_code.inc
@@ -186,9 +186,9 @@ function lab_migration_upload_code_form($form,$form_state)
$form['code_caption'] = array(
'#type' => 'textfield',
'#title' => t('Caption'),
+ '#description' => t('For eg: Shell & Tube Heat Exchanger Simulation'),
'#size' => 40,
'#maxlength' => 255,
- '#description' => t(''),
'#required' => TRUE,
);
$form['os_used'] = array(
@@ -214,7 +214,7 @@ function lab_migration_upload_code_form($form,$form_state)
);
$form['code_warning'] = array(
'#type' => 'item',
- '#title' => t('Upload all the dwsim project files in .zip format'),
+ '#title' => t('Upload all the dwsim project files in .dwxml/dwxmz format'),
'#prefix' => '<div style="color:red">',
'#suffix' => '</div>',
);
diff --git a/upload_code_delete.inc b/upload_code_delete.inc
index 0c63e5f..25ac329 100755
--- a/upload_code_delete.inc
+++ b/upload_code_delete.inc
@@ -9,6 +9,7 @@ function lab_migration_upload_code_delete()
global $user;
$root_path = lab_migration_path();
+ //var_dump($root_path);die;
$solution_id = (int)arg(3);
/* check solution */