code cleanup

Signed-off-by: Prashant P. Shah <pshah.mumbai@gmail.com>

4 files changed, 11 insertions, 10 deletions

diff --git a/bulk_approval.inc b/bulk_approval.inc
index 03cdc31..04c2bf2 100755
--- a/bulk_approval.inc
+++ b/bulk_approval.inc
@@ -290,7 +290,7 @@ function bulk_approval_form_submit($form, &$form_state)
 
         /* email */
         $email_subject = t('Your uploaded solutions have been approved');
-        $email_body = t('Your all the uploaded solutions for the lab have been approved.');
+        $email_body = t('Your all the uploaded solutions for the Lab have been approved.');
 
       } else if ($form_state['values']['run']['unapprove_lab'] == "1") {
 
@@ -304,7 +304,7 @@ function bulk_approval_form_submit($form, &$form_state)
 
         /* email */
         $email_subject = t('Your uploaded solutions have been marked as pending');
-        $email_body = t('Your all the uploaded solutions for the lab have been marked as pending to be review. You will be able to see the solutions after they have been approved by one of our reviewers.');
+        $email_body = t('Your all the uploaded solutions for the Lab have been marked as pending to be review. You will be able to see the solutions after they have been approved by one of our reviewers.');
 
       } else if ($form_state['values']['run']['disapprove_lab'] == "1") {
 
@@ -362,10 +362,11 @@ Reason for dis-approval:
             drupal_set_message(t("Lab directory not present : " . $dir_path . ". Skipping deleting lab directory."), 'status');
           }
 
-          /* deleting proposal */
+          /* deleting full proposal */
           $proposal_q = db_query("SELECT * FROM {lab_migration_proposal} WHERE id = %d", $form_state['values']['run']['lab']);
           $proposal_data = db_fetch_object($proposal_q);
           $proposal_id = $proposal_data->id;
+          db_query("DELETE FROM {lab_migration_experiment} WHERE proposal_id = %d", $proposal_id);
           db_query("DELETE FROM {lab_migration_proposal} WHERE id = %d", $proposal_id);
 
           drupal_set_message(t('Deleted Lab Proposal.'), 'status');
diff --git a/general_deletion.inc b/general_deletion.inc
index 4300759..3be225f 100755
--- a/general_deletion.inc
+++ b/general_deletion.inc
@@ -95,7 +95,7 @@ function delete_experiment($experiment_id)
   $status = TRUE;
   $root_path = lab_migration_path();
 
-  $experiment_q = db_query("SELECT * FROM {lab_migration_chapter} WHERE id = %d", $experiment_id);
+  $experiment_q = db_query("SELECT * FROM {lab_migration_experiment} WHERE id = %d", $experiment_id);
   $experiment_data = db_fetch_object($experiment_q);
   if (!$experiment_data)
   {
@@ -154,7 +154,7 @@ function delete_lab($lab_id)
   }
 
   /* delete experiments */
-  $experiment_q = db_query("SELECT * FROM {lab_migration_chapter} WHERE proposal_id = %d", $proposal_data->id);
+  $experiment_q = db_query("SELECT * FROM {lab_migration_experiment} WHERE proposal_id = %d", $proposal_data->id);
   while ($experiment_data = db_fetch_object($experiment_q))
   {
     if (!delete_experiment($experiment_data->id))
diff --git a/lab_migration.module b/lab_migration.module
index f20e018..b239997 100755
--- a/lab_migration.module
+++ b/lab_migration.module
@@ -383,7 +383,7 @@ function check_name($name = '') {
 }
 
 function check_code_number($number = '') {
-  if (!preg_match('/^[0-9]\.[0-9]$/', $number))
+  if (!preg_match('/^[0-9]+$/', $number))
     return FALSE;
   else
     return TRUE;
diff --git a/upload_code.inc b/upload_code.inc
index e4a9eac..4b3f214 100755
--- a/upload_code.inc
+++ b/upload_code.inc
@@ -274,7 +274,7 @@ function upload_code_form($form_state)
 function upload_code_form_validate($form, &$form_state)
 {
   if (!check_code_number($form_state['values']['code_number']))
-    form_set_error('code_number', t('Invalid Code Number. Code Number can contain only number dot number.'));
+    form_set_error('code_number', t('Invalid Code Number. Code Number can contain only numbers.'));
 
   if (!check_name($form_state['values']['code_caption']))
     form_set_error('code_caption', t('Caption can contain only alphabets, numbers and spaces.'));
@@ -384,7 +384,7 @@ function upload_code_form_submit($form, &$form_state) {
     mkdir($root_path . $dest_path);
 
   /*  get solution details - dont allow if already solution present */
-  $cur_solution_q = db_query("SELECT * FROM {lab_migration_solution} WHERE experiment_id = %d AND code_number = '%s'", $experiment_id, $form_state['values']['code_number']);
+  $cur_solution_q = db_query("SELECT * FROM {lab_migration_solution} WHERE experiment_id = %d AND code_number = '%s'", $experiment_id, $experiment_data->number . '.' . $form_state['values']['code_number']);
   if ($cur_solution_d = db_fetch_object($cur_solution_q))
   {
     if ($cur_solution_d->approval_status == 1)
@@ -409,7 +409,7 @@ function upload_code_form_submit($form, &$form_state) {
     mkdir($root_path . $dest_path);
 
   /* creating code directories */
-  $dest_path .= 'CODE' . $form_state['values']['code_number'] . '/';
+  $dest_path .= 'CODE' . $experiment_data->number . '.' . $form_state['values']['code_number'] . '/';
   if (!is_dir($root_path . $dest_path))
     mkdir($root_path . $dest_path);
 
@@ -417,7 +417,7 @@ function upload_code_form_submit($form, &$form_state) {
   db_query("INSERT INTO {lab_migration_solution} (experiment_id, approver_uid, code_number, caption, approval_date, approval_status, timestamp) VALUES (%d, %d, '%s', '%s', %d, %d, %d)",
     $experiment_id,
     0,
-    $form_state['values']['code_number'],
+    $experiment_data->number . '.' . $form_state['values']['code_number'],
     $form_state['values']['code_caption'],
     0,
     0,