From 861c481422e9b5442483c0c824757e2211d8c00e Mon Sep 17 00:00:00 2001
From: Sashi20
Date: Mon, 5 Feb 2024 15:44:07 +0530
Subject: Display send reminder mail for pending proposals only

---
 manage_proposal.inc      | 4 ++--
 scilab_case_study.module | 8 ++++----
 upload_code.inc          | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/manage_proposal.inc b/manage_proposal.inc
index 2fe10d3..687d8f0 100644
--- a/manage_proposal.inc
+++ b/manage_proposal.inc
@@ -50,7 +50,7 @@ function scilab_case_study_proposal_all()
                 $approval_status = 'Pending';
                 break;
             case 1:
-                $approval_status = 'Approved';
+                $approval_status = 'Approved | ' . l('Send Reminder Mail', 'case-study-project/manage-proposal/send-reminder-mail/' . $proposal_data->id);
                 break;
             case 2:
                 $approval_status = 'Dis-approved';
@@ -84,7 +84,7 @@ function scilab_case_study_proposal_all()
             $approval_date,
             $actual_completion_date,
             $approval_status,
-            l('Status', 'case-study-project/manage-proposal/status/' . $proposal_data->id) . ' | ' . l('Edit', 'case-study-project/manage-proposal/edit/' . $proposal_data->id) . ' | ' . l('Send Reminder Mail', 'case-study-project/manage-proposal/send-reminder-mail/' . $proposal_data->id),
+            l('Status', 'case-study-project/manage-proposal/status/' . $proposal_data->id) . ' | ' . l('Edit', 'case-study-project/manage-proposal/edit/' . $proposal_data->id),
         );
     } //$proposal_data = $proposal_q->fetchObject()
     /* check if there are any pending proposals */
diff --git a/scilab_case_study.module b/scilab_case_study.module
index 003831f..808d718 100644
--- a/scilab_case_study.module
+++ b/scilab_case_study.module
@@ -137,8 +137,8 @@ function scilab_case_study_menu()
         'file' => 'manage_proposal.inc',
     );
     $items['case-study-project/abstract-approval/bulk'] = array(
-        'title' => 'CS Manage Code',
-        'description' => 'Bulk Mangage',
+        'title' => 'Manage Case Study Submissions',
+        'description' => 'Manage Case Study Submissions',
         'page callback' => 'drupal_get_form',
         'page arguments' => array(
             'scilab_case_study_abstract_bulk_approval_form',
@@ -167,7 +167,7 @@ function scilab_case_study_menu()
         'weight' => 2,
     );
     $items['case-study-project/abstract-code'] = array(
-        'title' => 'Case Study Project Directory Submission',
+        'title' => 'Case Study Submission',
         'description' => 'Abstract Submission',
         'page callback' => 'scilab_case_study_abstract',
         'access callback' => 'user_access',
@@ -177,7 +177,7 @@ function scilab_case_study_menu()
         'file' => 'upload_code.inc',
     );
     $items['case-study-project/abstract-code/upload'] = array(
-        'title' => 'Case Study Project Directory Submission',
+        'title' => 'Case Study Submission',
         'description' => 'Project Upload',
         'page callback' => 'drupal_get_form',
         'access callback' => 'user_access',
diff --git a/upload_code.inc b/upload_code.inc
index b79307a..5025acb 100644
--- a/upload_code.inc
+++ b/upload_code.inc
@@ -646,7 +646,7 @@ function scilab_case_study_edit_upload_abstract_code_form_submit($form, &$form_s
                 $query = "UPDATE {case_study_submitted_abstracts_file} SET filename = :filename, filepath=:filepath, filemime=:filemime, filesize=:filesize, timestamp=:timestamp WHERE proposal_id = :proposal_id AND filetype = :filetype";
                 $args = array(
                     ":filename" => $_FILES['files']['name'][$file_form_name],
-                    ":filepath" => $file_path . $_FILES['files']['name'][$file_form_name],
+                    ":filepath" => $dest_path_project_files . $_FILES['files']['name'][$file_form_name],
                     ":filemime" => mime_content_type($root_path . $dest_path_project_files . $_FILES['files']['name'][$file_form_name]),
                     ":filesize" => $_FILES['files']['size'][$file_form_name],
                     ":timestamp" => time(),
-- 
cgit