From 46e9cd63818bdf68e113f68be1aa8bff40350d55 Mon Sep 17 00:00:00 2001
From: Saketh1499
Date: Tue, 26 Apr 2022 15:55:36 +0530
Subject: Updating manage proposal status form
---
manage_proposal.inc | 36 ++++++++++++++++++++++++++++++------
1 file changed, 30 insertions(+), 6 deletions(-)
diff --git a/manage_proposal.inc b/manage_proposal.inc
index 67aa601..9bd6ae7 100755
--- a/manage_proposal.inc
+++ b/manage_proposal.inc
@@ -123,13 +123,19 @@ function _proposal_all()
else{
$proposed_completion_date = "-----";
}
+ $completion_date = ' ';
+ if($proposal_data->completion_date == 0){
+ $completion_date = "-----";
+ }
+ else{
+ $completion_date = date('d-m-Y', $proposal_data->completion_date);
+ }
$proposal_rows[] = array(
date('d-m-Y', $proposal_data->creation_date),
"{$preference_data->book}
by {$preference_data->author}",
l($proposal_data->full_name, 'user/' . $proposal_data->uid),
- date('d-m-Y', $proposal_data->completion_date),
- $proposed_completion_date,
+ $completion_date,
$proposal_status,
t($code_submission_status),
l('Status', 'textbook-companion/manage-proposal/status/' . $proposal_data->id) . ' | ' . l('Edit', 'textbook-companion/manage-proposal/edit/' . $proposal_data->id) . _tbc_ext($proposal_status, $preference_data->id)
@@ -144,8 +150,7 @@ function _proposal_all()
'Date of Submission',
'Title of the Book',
'Contributor Name',
- 'Actual Date of Completion',
- 'Proposed Date of Completion',
+ 'Date of Completion',
'Status',
'Is all code submitted',
'Action'
@@ -576,10 +581,29 @@ function proposal_status_form($from, $form_state)
'#markup' => $proposal_data->reviewer,
'#title' => t('Reviewer')
);
+ if($proposal_data->completion_date == 0){
+ $actual_completion_date = "-----";
+ }
+ else{
+ $actual_completion_date = date('d-m-Y', $proposal_data->completion_date);
+ }
$form['completion_date'] = array(
'#type' => 'item',
- '#markup' => date('d-m-Y', $proposal_data->completion_date),
- '#title' => t('Expected Date of Completion')
+ '#markup' => $actual_completion_date,
+ '#title' => t('Date of Completion')
+ );
+ if($proposal_data->proposed_completion_date != 0){
+ $proposed_completion_date = date('d-m-Y', $proposal_data->proposed_completion_date);
+ }
+ else{
+ $proposed_completion_date = "-----";
+ }
+
+ $form['proposed_completion_date'] = array(
+ '#type' => 'item',
+ '#markup' => $proposed_completion_date,
+
+ '#title' => t('Proposed Date of Completion')
);
$form['operating_system'] = array(
'#type' => 'item',
--
cgit
From 086775fcb5633a52b7eaa651727c31a5c6252259 Mon Sep 17 00:00:00 2001
From: Saketh1499
Date: Mon, 2 May 2022 13:39:34 +0530
Subject: Adding approval date field in status form
---
manage_proposal.inc | 40 ++++++++++++++++++++++++----------------
1 file changed, 24 insertions(+), 16 deletions(-)
diff --git a/manage_proposal.inc b/manage_proposal.inc
index 9bd6ae7..230d9e9 100755
--- a/manage_proposal.inc
+++ b/manage_proposal.inc
@@ -123,19 +123,17 @@ function _proposal_all()
else{
$proposed_completion_date = "-----";
}
- $completion_date = ' ';
- if($proposal_data->completion_date == 0){
- $completion_date = "-----";
+ if($proposal_data->completion_date != 0){
+ $completion_date = date('d-m-Y', $proposal_data->completion_date);
}
else{
- $completion_date = date('d-m-Y', $proposal_data->completion_date);
+ $completion_date = date('d-m-Y', $proposal_data->approval_date);
}
$proposal_rows[] = array(
date('d-m-Y', $proposal_data->creation_date),
- "{$preference_data->book}
-by {$preference_data->author}",
+ "{$preference_data->book}
by {$preference_data->author}",
l($proposal_data->full_name, 'user/' . $proposal_data->uid),
- $completion_date,
+ //$completion_date,
$proposal_status,
t($code_submission_status),
l('Status', 'textbook-companion/manage-proposal/status/' . $proposal_data->id) . ' | ' . l('Edit', 'textbook-companion/manage-proposal/edit/' . $proposal_data->id) . _tbc_ext($proposal_status, $preference_data->id)
@@ -150,7 +148,7 @@ function _proposal_all()
'Date of Submission',
'Title of the Book',
'Contributor Name',
- 'Date of Completion',
+ //'Date of Approval/Completion',
'Status',
'Is all code submitted',
'Action'
@@ -581,28 +579,38 @@ function proposal_status_form($from, $form_state)
'#markup' => $proposal_data->reviewer,
'#title' => t('Reviewer')
);
- if($proposal_data->completion_date == 0){
- $actual_completion_date = "-----";
+ if($proposal_data->approval_date != 0){
+ $approval_date = date('d-m-Y', $proposal_data->approval_date);
+ }
+ else{
+ $approval_date = "-----";
+ }
+ $form['approval_date'] = array(
+ '#type' => 'item',
+ '#markup' => $approval_date,
+ '#title' => t('Date of Approval')
+ );
+ if($proposal_data->completion_date != 0){
+ $completion_date = date('d-m-Y', $proposal_data->completion_date);
}
else{
- $actual_completion_date = date('d-m-Y', $proposal_data->completion_date);
+ $completion_date = "-----";
}
$form['completion_date'] = array(
'#type' => 'item',
- '#markup' => $actual_completion_date,
+ '#markup' => $completion_date,
'#title' => t('Date of Completion')
);
if($proposal_data->proposed_completion_date != 0){
$proposed_completion_date = date('d-m-Y', $proposal_data->proposed_completion_date);
- }
- else{
+ }
+ else{
$proposed_completion_date = "-----";
- }
+ }
$form['proposed_completion_date'] = array(
'#type' => 'item',
'#markup' => $proposed_completion_date,
-
'#title' => t('Proposed Date of Completion')
);
$form['operating_system'] = array(
--
cgit
From 8e60ab1c506f4727fa1f619082362fd591a2b100 Mon Sep 17 00:00:00 2001
From: Saketh1499
Date: Wed, 4 May 2022 13:14:20 +0530
Subject: Updating proposal form
---
textbook_companion.module | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/textbook_companion.module b/textbook_companion.module
index a2fda42..b872d7a 100755
--- a/textbook_companion.module
+++ b/textbook_companion.module
@@ -1720,7 +1720,9 @@ function book_proposal_form_submit($form, &$form_state, $directory_name = NULL)
}
$form_state['values']['reason'] = $my_reason;
- } //isset($_POST['reason'])
+ }
+ $actual_completion_date = 0;
+ //isset($_POST['reason'])
$query = "INSERT INTO {textbook_companion_proposal}
(uid, approver_uid, name_title, full_name, mobile, how_project, course, branch, university,city,pincode,state,country, faculty, reviewer,reference, completion_date, creation_date, approval_date, proposal_status, r_version, operating_system, teacher_email,reason,samplefilepath,proposal_type,proposed_completion_date, book_download_link) VALUES (:uid, :approver_uid, :name_title, :full_name, :mobile, :how_project, :course, :branch, :university, :city,:pincode,:state,:country, :faculty, :reviewer,:reference, :completion_date,
:creation_date, :approval_date, :proposal_status, :r_version, :operating_system,
@@ -1742,7 +1744,7 @@ function book_proposal_form_submit($form, &$form_state, $directory_name = NULL)
":faculty" => ucwords(strtolower($form_state['values']['faculty'])),
":reviewer" => $form_state['values']['reviewer'],
":reference" => trim($form_state['values']['reference']),
- ":completion_date" => $completion_date_timestamp,
+ ":completion_date" => $actual_completion_date,
":creation_date" => time(),
":approval_date" => 0,
":proposal_status" => 0,
@@ -1758,6 +1760,7 @@ function book_proposal_form_submit($form, &$form_state, $directory_name = NULL)
$result = db_query($query, $args, array(
'return' => Database::RETURN_INSERT_ID
));
+ //var_dump($args);die;
$dest_path = $result . '/';
if (!is_dir($root_path . $dest_path))
mkdir($root_path . $dest_path);
--
cgit