Merge pull request #5 from nikitasabale96/main

new changes in the proposal all and Run form

2 files changed, 11 insertions, 9 deletions

diff --git a/src/Controller/DefaultController.php b/src/Controller/DefaultController.php
index 8803349..e9e2352 100755
--- a/src/Controller/DefaultController.php
+++ b/src/Controller/DefaultController.php
@@ -604,10 +604,10 @@ $link = Link::fromTextAndUrl(t('Edit'), $url)->toString();
                 break;
         }
       
-      // $approval_url =  Link::fromTextAndUrl('Status', Url::fromRoute('lab_migration.proposal_status_form',['id'=>$proposal_data->id]))->toString();
-      //var_dump($approval_url);die;
-      // $edit_url =  Link::fromTextAndUrl('Edit', Url::fromRoute('lab_migration.proposal_edit_form',['id'=>$proposal_data->id]))->toString();
-      // $mainLink = t('@linkApprove | @linkReject', array('@linkApprove' => $approval_url, '@linkReject' => $edit_url));
+      $approval_url =  Link::fromTextAndUrl('Status', Url::fromRoute('lab_migration.proposal_status_form',['id'=>$proposal_data->id]))->toString();
+      // var_dump($approval_url);die;
+      $edit_url =  Link::fromTextAndUrl('Edit', Url::fromRoute('lab_migration.proposal_edit_form',['id'=>$proposal_data->id]))->toString();
+      $mainLink = t('@linkApprove | @linkReject', array('@linkApprove' => $approval_url, '@linkReject' => $edit_url));
       
         $proposal_rows[] = array(
             date('d-m-Y', $proposal_data->creation_date),
@@ -615,13 +615,14 @@ $link = Link::fromTextAndUrl(t('Edit'), $url)->toString();
             //  $link = Link::fromTextAndUrl($proposal_data->name, $uid_url)->toString(),
             Link::fromTextAndUrl($proposal_data->name, Url::fromRoute('entity.user.canonical', ['user' => $proposal_data->uid])),
         
-
+           
             // Link::fromTextAndUrl($pending_data->name, 'user/' . $pending_data->uid),
             $proposal_data->lab_title,
             $proposal_data->department,
             $approval_status,
-            // $mainLink 
-          
+            $mainLink 
+            // Link::fromTextAndUrl('Status', Url::fromRoute('lab_migration.proposal_status_form',['id'=>$proposal_data->id]))->toString() ,
+            // Link::fromTextAndUrl('Edit', Url::fromRoute('lab_migration.proposal_edit_form',['id'=>$proposal_data->id]))->toString(),
             );
           }
         $proposal_header = array(
diff --git a/src/Form/LabMigrationRunForm.php b/src/Form/LabMigrationRunForm.php
index 1be32ec..b884619 100755
--- a/src/Form/LabMigrationRunForm.php
+++ b/src/Form/LabMigrationRunForm.php
@@ -142,7 +142,8 @@ class LabMigrationRunForm extends FormBase {
         while ($solution_list_data = $solution_list_q->fetchObject()) {
  
 //var_dump($solution_list_data);die;
-          $solution_file_type = '';
+          // $solution_file_type = [];
+          // var_dump($solution_list_data->filetype);die;
           switch ($solution_list_data->filetype) {
             case 'S':
               $solution_file_type = 'Source or Main file';
@@ -162,7 +163,7 @@ class LabMigrationRunForm extends FormBase {
           $items = [
            
              Link::fromTextAndUrl($solution_list_data->filename, Url::fromUri('internal:/lab-migration/download/file/' . $solution_list_data->id))->toString(),
-            "{$experiments_file_type}"
+            "{$solution_file_type}"
           ];
         }
       }