Merge pull request #35 from Sashi20/main

add list of final submissions in all submissions page

1 files changed, 64 insertions, 2 deletions

diff --git a/hackathon_submission.module b/hackathon_submission.module
index b29a71b..a9d5dac 100644
--- a/hackathon_submission.module
+++ b/hackathon_submission.module
@@ -441,12 +441,12 @@ function hackathon_submission_menu()
     );
     $items["mixed-signal-soc-design-marathon/all-submissions"] = array(
         "title" => "List of all Mixed Signal SoC Design Marathon submissions",
-        "page callback" => "soc_marathon_display_literature_submissions",
+        "page callback" => "soc_marathon_display_final_submissions",
         "access arguments" => array(
             "manage hackathon_submission"
         ),
     );
-    $items["mixed-signal-design-marathon/all-submissions/literature-survey"] = array(
+    $items["mixed-signal-soc-design-marathon/all-submissions/literature-survey"] = array(
         "title" => "List of all Mixed Signal SoC Design Marathon Literature survey submissions",
         "page callback" => "soc_marathon_display_literature_submissions",
         "access arguments" => array(
@@ -455,6 +455,15 @@ function hackathon_submission_menu()
         'type' => MENU_LOCAL_TASK,
         'weight' => 1
     );
+    $items["mixed-signal-soc-design-marathon/all-submissions/final-submissions"] = array(
+        "title" => "List of all Mixed Signal SoC Design Marathon Final submissions",
+        "page callback" => "soc_marathon_display_final_submissions",
+        "access arguments" => array(
+            "manage hackathon_submission"
+        ),
+        'type' => MENU_DEFAULT_LOCAL_TASK,
+        'weight' => 0
+    );
     $items["mixed-signal-soc-design-marathon/download-emails"] = array(
         "title" => "Download SoC marathon participants emails",
         "page callback" => "soc_marathon_download_emails",
@@ -1837,6 +1846,59 @@ More details about this event can be found here: <a href='https://hackathon.foss
 }
 }
 
+
+function soc_marathon_display_final_submissions()
+{
+    global $user;
+    /* get pending submissions to be approved */
+    if ($user->uid == 0)
+    {
+        $msg = drupal_set_message(t('It is mandatory to login on this website to view all submissions. If you are new user please create a new account first.'), 'error');
+        //drupal_goto('/pssp');
+        drupal_goto('user/login', array('query' => drupal_get_destination()));
+        return $msg;
+    }
+    $my_submission_rows = array();
+    $query = db_select('mixed_signal_soc_marathon_final_submission');
+    $query->fields('mixed_signal_soc_marathon_final_submission');
+    $query->orderBy('id', 'DESC');
+    $my_submissions_q = $query->execute();
+    $output = "<p>Total number of submissions: " . $my_submissions_q->rowCount();
+    while ($my_submissions_data = $my_submissions_q->fetchObject())
+    {
+        $query = db_select('mixed_signal_soc_marathon_literature_survey');
+        $query->fields('mixed_signal_soc_marathon_literature_survey');
+        $query->condition('id',$my_submissions_data->literature_survey_id);
+        $query->orderBy('id', 'DESC');
+        $final_submissions_q = $query->execute();
+        $final_submission_data = $final_submissions_q->fetchObject();
+        $action =  l('View', 'mixed-signal-soc-design-marathon/view/final-submission/' . $final_submission_data->id);  
+        $my_submission_rows[$my_submissions_data->id] = array(
+            date('d-m-Y', $my_submissions_data->creation_date),
+            l($final_submission_data->participant_name, 'user/' . $final_submission_data->uid),
+            $final_submission_data->circuit_name,
+            $action
+        );
+    } //$pending_data = $pending_q->fetchObject()
+    /* check if there are any pending submissions */
+    if (!$my_submission_rows)
+    {
+        drupal_set_message(t('There are no active submissions'), 'status');
+        return '';
+    } //!$pending_rows
+    $my_submission_header = array(
+        'Date of Submission',
+        'Name',
+        'Circuit Name',
+        'Final Submission'
+    );
+    //$output = theme_table($pending_header, $pending_rows);
+    $output .= theme('table', array(
+        'header' => $my_submission_header,
+        'rows' => $my_submission_rows
+    ));
+    return $output;
+}
 function soc_marathon_display_literature_submissions()
 {
     global $user;