Merge pull request #3 from nikitasabale96/main

lab migration is in the drupal 10

20 files changed, 25 insertions, 68 deletions

diff --git a/src/Controller/DefaultController.php b/src/Controller/DefaultController.php
index 00d16e7..8803349 100755
--- a/src/Controller/DefaultController.php
+++ b/src/Controller/DefaultController.php
@@ -640,6 +640,7 @@ $link = Link::fromTextAndUrl(t('Edit'), $url)->toString();
     ];
       return $output;   
       }
+      
       public function lab_migration_category_all()
       {
         /* get pending proposals to be approved */
@@ -1318,7 +1319,7 @@ $root_path = \Drupal::service("lab_migration_global")->lab_migration_path();
       
     }
   }
-                
+               
  
   
     public function lab_migration_labs_progress_all() {
@@ -2155,5 +2156,4 @@ function lab_migration_category_edit_form(array $form, FormStateInterface $form_
 
 
 
-}
-?>
+}
\ No newline at end of file
diff --git a/src/Form/GenerateLmPdf.php b/src/Form/GenerateLmPdf.php
index fe8149c..8f383aa 100755
--- a/src/Form/GenerateLmPdf.php
+++ b/src/Form/GenerateLmPdf.php
@@ -383,4 +383,4 @@ $lab_certi_id = (int) $route_match->getParameter('lab_certi_id');
   public function submitForm(array &$form, \Drupal\Core\Form\FormStateInterface $form_state){
   }
 }
-?>
+
diff --git a/src/Form/LabMigrationBulkApprovalForm.php b/src/Form/LabMigrationBulkApprovalForm.php
index 0f79c76..a130d55 100755
--- a/src/Form/LabMigrationBulkApprovalForm.php
+++ b/src/Form/LabMigrationBulkApprovalForm.php
@@ -1073,4 +1073,4 @@ public function _bulk_list_experiment_actions()
     return $msg;
   }
  }
-?>
+
diff --git a/src/Form/LabMigrationBulkUploadCodeForm.php b/src/Form/LabMigrationBulkUploadCodeForm.php
index cc38370..f304caf 100755
--- a/src/Form/LabMigrationBulkUploadCodeForm.php
+++ b/src/Form/LabMigrationBulkUploadCodeForm.php
@@ -473,4 +473,4 @@ $response->send();
   }
 
 }
-?>
+
diff --git a/src/Form/LabMigrationCategoryEditForm.php b/src/Form/LabMigrationCategoryEditForm.php
index fbd9832..aa47583 100755
--- a/src/Form/LabMigrationCategoryEditForm.php
+++ b/src/Form/LabMigrationCategoryEditForm.php
@@ -181,4 +181,4 @@ $proposal_id = (int) $route_match->getParameter('id');
   }
 
 }
-?>
+
diff --git a/src/Form/LabMigrationCertificateEditForm.php b/src/Form/LabMigrationCertificateEditForm.php
index b749d71..46c2330 100755
--- a/src/Form/LabMigrationCertificateEditForm.php
+++ b/src/Form/LabMigrationCertificateEditForm.php
@@ -165,4 +165,4 @@ $certi_id = (int) $route_match->getParameter('certi_id');
   }
 
 }
-?>
+
diff --git a/src/Form/LabMigrationCertificateForm.php b/src/Form/LabMigrationCertificateForm.php
index 97abfc3..c4e8e09 100755
--- a/src/Form/LabMigrationCertificateForm.php
+++ b/src/Form/LabMigrationCertificateForm.php
@@ -112,4 +112,4 @@ $response->send();
   }
 
 }
-?>
+
diff --git a/src/Form/LabMigrationCertificateParticipationEditForm.php b/src/Form/LabMigrationCertificateParticipationEditForm.php
index edda896..7bd7b7b 100755
--- a/src/Form/LabMigrationCertificateParticipationEditForm.php
+++ b/src/Form/LabMigrationCertificateParticipationEditForm.php
@@ -163,4 +163,4 @@ $certi_id = (int) $route_match->getParameter('certi_id');
   }
 
 }
-?>
+
diff --git a/src/Form/LabMigrationCertificateParticipationForm.php b/src/Form/LabMigrationCertificateParticipationForm.php
index 03ceb63..08956b7 100755
--- a/src/Form/LabMigrationCertificateParticipationForm.php
+++ b/src/Form/LabMigrationCertificateParticipationForm.php
@@ -108,4 +108,3 @@ class LabMigrationCertificateParticipationForm extends FormBase {
   }
 
 }
-?>
diff --git a/src/Form/LabMigrationCodeApprovalForm.php b/src/Form/LabMigrationCodeApprovalForm.php
index 5deb242..60c5f96 100755
--- a/src/Form/LabMigrationCodeApprovalForm.php
+++ b/src/Form/LabMigrationCodeApprovalForm.php
@@ -376,4 +376,4 @@ $solution_id = (int) $route_match->getParameter('solution_id');
   }
 
 }
-?>
+
diff --git a/src/Form/LabMigrationLabNotesForm.php b/src/Form/LabMigrationLabNotesForm.php
index e642728..d1dc5d5 100755
--- a/src/Form/LabMigrationLabNotesForm.php
+++ b/src/Form/LabMigrationLabNotesForm.php
@@ -128,4 +128,4 @@ $response->send();
   }
 
 }
-?>
+
diff --git a/src/Form/LabMigrationProposalApprovalForm.php b/src/Form/LabMigrationProposalApprovalForm.php
index 1d3a29e..fe68d5c 100755
--- a/src/Form/LabMigrationProposalApprovalForm.php
+++ b/src/Form/LabMigrationProposalApprovalForm.php
@@ -369,4 +369,4 @@ $config = \Drupal::config('Lab_migration.settings');
   }
 
 }
-?>
+
diff --git a/src/Form/LabMigrationProposalEditForm.php b/src/Form/LabMigrationProposalEditForm.php
index 3f40f68..a6c5aed 100755
--- a/src/Form/LabMigrationProposalEditForm.php
+++ b/src/Form/LabMigrationProposalEditForm.php
@@ -633,4 +633,4 @@ $proposal_id = (int) $route_match->getParameter('id');
 
 
 }
-?>
+
diff --git a/src/Form/LabMigrationProposalForm.php b/src/Form/LabMigrationProposalForm.php
index a21c109..5c03a1f 100755
--- a/src/Form/LabMigrationProposalForm.php
+++ b/src/Form/LabMigrationProposalForm.php
@@ -719,4 +719,4 @@ if (!\Drupal::service('lab_migration_email')->lab_migration_mail('lab_migration'
   }
 
 }
-?>
+
diff --git a/src/Form/LabMigrationProposalStatusForm.php b/src/Form/LabMigrationProposalStatusForm.php
index 13c42cd..3310759 100755
--- a/src/Form/LabMigrationProposalStatusForm.php
+++ b/src/Form/LabMigrationProposalStatusForm.php
@@ -288,7 +288,7 @@ $proposal_id = (int) $route_match->getParameter('id');
       else {
         \Drupal::messenger()->addmessage(t('Invalid proposal selected. Please try again.'), 'error');
         // RedirectResponse('lab-migration/manage-proposal');
-        $response = new RedirectResponse('/lab-migration/manage-proposal');
+        $response = new RedirectResponse('/lab-migration/manage-proposal/pending-solution');
         $response->send();
         return;
       }
@@ -349,4 +349,4 @@ $response->send();
   }
 
 }
-?>
+
diff --git a/src/Form/LabMigrationRunForm.php b/src/Form/LabMigrationRunForm.php
index 8cc6da9..67eaf27 100755
--- a/src/Form/LabMigrationRunForm.php
+++ b/src/Form/LabMigrationRunForm.php
@@ -33,7 +33,7 @@ class LabMigrationRunForm extends FormBase {
   public function buildForm(array $form, \Drupal\Core\Form\FormStateInterface $form_state)
 
   {
-    $options_first =$this->_list_of_labs();
+    $options_first =$this->_list_of_labs($selected);
     $options_two = $this->_ajax_get_experiment_list();
     // $select_two = isset($form_state['values']['lab_experiment_list']) ? $form_state['values']['lab_experiment_list'] : key($options_two);
     $select_two = $form_state->getValue('lab_experiment_list') ?: key($options_two);
@@ -162,7 +162,7 @@ class LabMigrationRunForm extends FormBase {
           $items = [
            
              Link::fromTextAndUrl($solution_list_data->filename, Url::fromUri('internal:/lab-migration/download/file/' . $solution_list_data->id))->toString(),
-            "{$solution_file_type}"
+            "{$experiments_file_type}"
           ];
         }
       }
@@ -187,6 +187,7 @@ class LabMigrationRunForm extends FormBase {
             // Add the table to the fieldset
 $form['download_solution_wrapper']['solution_files']['table'] = $table;
         
+        
       
         
         
@@ -204,49 +205,6 @@ $form['download_solution_wrapper']['solution_files']['table'] = $table;
   public function ajax_solution_list_callback(array &$form, FormStateInterface $form_state) {
     return $form['download_experiment_wrapper'];
     
-//     $response = new AjaxResponse();
-//     $experiment_list_default_value = $form_state->getValue('lab_experiment_list');
-//     // var_dump($experiment_list_default_value);die;
-//     if ($experiment_list_default_value != 0) {
-//       $exp_download_link = Link::fromTextAndUrl(
-//         $this->t('Download Experiment'),
-//         Url::fromRoute('lab_migration.download_experiment', ['experiment_id' => $experiment_list_default_value])
-//       )->toString();
-//       // Update the solution list options
-     
-      
-//       // Add the commands to update the DOM
-      
-//       $response->addCommand(new HtmlCommand('#ajax_download_experiments', Link::fromTextAndUrl('Download Experiment', Url::fromUri('internal:/lab-migration/download/experiment/' . $experiment_list_default_value))->toString()));
-//       $response->addCommand(new HtmlCommand('#ajax_selected_experiment', \Drupal::service('renderer')->render($form['lab_experiment_list'])));
-//       //$form['lab_solution_list']['#options'] = $this->_ajax_get_solution_list($experiment_list_default_value);
-//       //$response->addCommand(new HtmlCommand('#ajax_download_experiments'), $exp_download_link);
-//       //$response->addCommand(new HtmlCommand('#ajax_selected_solution', \Drupal::service('renderer')->render($form['lab_solution_list'])));
-//       $form_state->setRebuild(TRUE);
-//     }
-//     // else {
-//     //   // Default options when no experiment is selected
-//     //   $form['lab_solution_list']['#options'] = $this->_ajax_get_solution_list();
-      
-//     //   // Clear the DOM elements
-//     //       $commands = [];
-//     //       $response->addCommand(new HtmlCommand('#ajax_selected_solution', \Drupal::service('renderer')->render($form['lab_solution_list'])));
-//     //   $commands[] = new HtmlCommand('#ajax_download_experiments', '');
-//     //   $commands[] = new HtmlCommand('#ajax_selected_solution', '');
-//     //   $commands[] = new HtmlCommand('#ajax_solution_files', '');
-//     //   $commands[] = new HtmlCommand('#ajax_download_experiment_solution', '');
-//     //   $commands[] = new HtmlCommand('#ajax_edit_experiment_solution', '');
-//     //   // Uncomment if needed
-//     //   // $commands[] = new ReplaceCommand('#ajax_selected_experiment', \Drupal::service('renderer')->render($form['lab_experiment_list']));
-//     // }
-    
-//     // Return the response with commands
-//     // $response = new AjaxResponse();
-//     // $response->addCommand(new AppendCommand('#element-id', 'Updated content'));
-//     //return $response;
-  
-
-// return $response;
   }
   
   public function ajax_solution_files_callback(array &$form, \Drupal\Core\Form\FormStateInterface $form_state) {
@@ -362,7 +320,7 @@ return $form['download_solution_wrapper'];
   }
   
 /*****************************************************/
-public function _list_of_labs()
+public function _list_of_labs($selected)
   {
     $lab_titles = array(
         '0' => 'Please select...'
diff --git a/src/Form/LabMigrationSettingsForm.php b/src/Form/LabMigrationSettingsForm.php
index 6d469d8..abb4dce 100755
--- a/src/Form/LabMigrationSettingsForm.php
+++ b/src/Form/LabMigrationSettingsForm.php
@@ -147,4 +147,4 @@ class LabMigrationSettingsForm extends ConfigFormBase {
   }
 
 }
-?>
+
diff --git a/src/Form/LabMigrationSolutionProposalApprovalForm.php b/src/Form/LabMigrationSolutionProposalApprovalForm.php
index 2283744..583652f 100755
--- a/src/Form/LabMigrationSolutionProposalApprovalForm.php
+++ b/src/Form/LabMigrationSolutionProposalApprovalForm.php
@@ -318,4 +318,4 @@ $proposal_id = (int) $route_match->getParameter('proposal_id');
   }
 
 }
-?>
+
diff --git a/src/Form/LabMigrationSolutionProposalForm.php b/src/Form/LabMigrationSolutionProposalForm.php
index a911ece..f3185a9 100755
--- a/src/Form/LabMigrationSolutionProposalForm.php
+++ b/src/Form/LabMigrationSolutionProposalForm.php
@@ -379,4 +379,4 @@ return $response;
   }
 
 }
-?>
+
diff --git a/src/Form/LabMigrationUploadCodeForm.php b/src/Form/LabMigrationUploadCodeForm.php
index 6c0bba5..cf5e06f 100755
--- a/src/Form/LabMigrationUploadCodeForm.php
+++ b/src/Form/LabMigrationUploadCodeForm.php
@@ -581,4 +581,4 @@ $response->send();
   }
 
 
-?>
+