diff options
| -rwxr-xr-x | download.inc | 12 | ||||
| -rwxr-xr-x | dwsim_flowsheet.module | 6 | ||||
| -rw-r--r-- | proposals_review_tab.inc | 30 |
3 files changed, 19 insertions, 29 deletions
diff --git a/download.inc b/download.inc index a329bf3..c034eac 100755 --- a/download.inc +++ b/download.inc @@ -308,7 +308,7 @@ function dwsim_flowsheet_download_proposals() { $root_path = dwsim_flowsheet_path(); $result = db_query("SELECT e.contributor_name as Contirbutor_Name, u.mail as Email_ID, e.project_title as Title, e.contact_no as Contact, from_unixtime(actual_completion_date,'%Y') as Year FROM dwsim_flowsheet_proposal as e JOIN users as u ON e.uid = u.uid WHERE e.approval_status=3 ORDER BY actual_completion_date DESC"); - +//var_dump($result->rowCount());die(); //$all_proposals_q = $result->execute(); $participants_proposal_id_file = $root_path . "participants-proposals.csv"; $fp = fopen($participants_proposal_id_file, "w"); @@ -323,11 +323,11 @@ function dwsim_flowsheet_download_proposals() fputcsv($fp, $items); while($row = $result->fetchObject()) { $items = array( - $row->contributor_name, - $row->mail, - $row->project_title, - $row->contact_no, - $row->actual_completion_date + $row->Contirbutor_Name, + $row->Email_ID, + $row->Title, + $row->Contact, + $row->Year ); fputcsv($fp, $items); } diff --git a/dwsim_flowsheet.module b/dwsim_flowsheet.module index ea1b475..7e2a5a9 100755 --- a/dwsim_flowsheet.module +++ b/dwsim_flowsheet.module @@ -370,7 +370,7 @@ function dwsim_flowsheet_menu() 'description' => 'Download Proposals', 'page callback' => 'dwsim_flowsheet_download_proposals', 'access arguments' => array( - 'dwsim flowsheet download code' + 'dwsim flowsheet download proposals' ), 'type' => MENU_CALLBACK, 'file' => 'download.inc' @@ -562,6 +562,10 @@ function dwsim_flowsheet_permission() 'title' => t('dwsim flowsheet download code'), 'restrict access' => TRUE ), + 'dwsim flowsheet download proposals' => array( + 'title' => t('dwsim flowsheet download proposals'), + 'restrict access' => TRUE + ), 'administer dwsim flowsheet' => array( 'title' => t('administer dwsim flowsheet'), 'restrict access' => TRUE diff --git a/proposals_review_tab.inc b/proposals_review_tab.inc index 4294607..bccb440 100644 --- a/proposals_review_tab.inc +++ b/proposals_review_tab.inc @@ -100,8 +100,9 @@ function dwsim_flowsheet_completed_tab_form($form, $form_state) { $options_first = _flowsheet_details_year_wise(); $selected = isset($form_state['values']['howmany_select']) ? $form_state['values']['howmany_select'] : key($options_first); + $form = array(); $form['howmany_select'] = array( - '#title' => t('Sorting projects according to year:'), + '#title' => t('Sorting projects according to year:'), '#type' => 'select', '#options' => _flowsheet_details_year_wise(), /*'#options' => array( @@ -144,12 +145,13 @@ function ajax_example_autocheckboxes_callback($form, $form_state) ); } + function _flowsheet_details_year_wise() { $flowsheet_years = array( '0' => 'Please select...' ); - $result = db_query("SELECT from_unixtime(actual_completion_date, '%Y ') from dwsim_flowsheet_proposal WHERE approval_status = 3"); + $result = db_query("SELECT from_unixtime(actual_completion_date, '%Y ') as Year from dwsim_flowsheet_proposal WHERE approval_status = 3"); /*$query = db_select('dwsim_flowsheet_proposal'); $query->fields('dwsim_flowsheet_proposal'); @@ -159,7 +161,7 @@ function _flowsheet_details_year_wise() //$year_wise_list = $query->execute(); while ($year_wise_list_data = $result->fetchObject()) { - $flowsheet_years[$year_wise_list_data->id] = $year_wise_list_data->actual_completion_date; + $flowsheet_years[$year_wise_list_data->Year] = $year_wise_list_data->Year; } return $flowsheet_years; } @@ -168,22 +170,20 @@ function _flowsheet_details_year_wise() function _flowsheet_details($flowsheet_proposal_id) { $output = ""; - $output = "Click <a href='/flowsheeting-project/download-proposals'>here</a> to download the Proposals of the participants <br>"; + //$output = "Click <a href='/flowsheeting-project/download-proposals'>here</a> to download the Proposals of the participants <br>"; $result = db_query("SELECT * from {dwsim_flowsheet_proposal} WHERE approval_status = 3 and from_unixtime(actual_completion_date, '%Y') = :year", array( ':year' => $flowsheet_proposal_id) ); if ($result->rowCount() == 0) - { - // $output = "Click <a href='/flowsheeting-project/download-proposals/'>here</a> to download the Proposals of the participants"; + { $output .= "Work has been completed for the following flow sheets."; } else { - - $output .= "Work has been completed for the following flow sheets: " . $result->rowCount() ; + $output .= "Work has been completed for the following flow sheets: " . $result->rowCount() . "<hr>"; $preference_rows = array(); $i = 1; while ($row = $result->fetchObject()) @@ -211,18 +211,4 @@ function _flowsheet_details($flowsheet_proposal_id) )); } return $output; -} - - -/////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////// - -//Proposal tab for Downloading proposals - -function dwsim_flowsheet_download_proposals_tab() -{ - $output= ""; - - }
\ No newline at end of file |