Merge pull request #2 from nikitasabale96/main

FreeCAD is updated in drupal 10

12 files changed, 74 insertions, 74 deletions

diff --git a/lab_migration.routing.yml b/lab_migration.routing.yml
index a2630d0..aa3b3cf 100755
--- a/lab_migration.routing.yml
+++ b/lab_migration.routing.yml
@@ -1,5 +1,5 @@
 lab_migration.proposal_form:
-  path: /lab_migration/proposal
+  path: /lab-migration/proposal
   defaults:
     _title: 'Lab Migration Proposal'
     _form: \Drupal\lab_migration\Form\LabMigrationProposalForm
@@ -7,224 +7,224 @@ lab_migration.proposal_form:
   requirements:
     _permission: 'lab migration create proposal'
 lab_migration.proposal_pending:
-  path: /lab_migration/manage-proposal/pending
+  path: /lab-migration/manage-proposal/pending
   defaults:
     _title: 'Pending Proposals'
     _controller: '\Drupal\lab_migration\Controller\DefaultController::lab_migration_proposal_pending'
   requirements:
     _permission: 'lab migration manage proposal'
 lab_migration.solution_proposal_pending:
-  path: /lab_migration/manage-proposal/pending-solution-proposal
+  path: /lab-migration/manage-proposal/pending-solution-proposal
   defaults:
     _title: 'Pending Solution Proposals'
     _controller: '\Drupal\lab_migration\Controller\DefaultController::lab_migration_solution_proposal_pending'
   requirements:
     _permission: 'lab migration manage proposal'
 lab_migration.proposal_pending_solution:
-  path: /lab_migration/manage-proposal/pending-solution
+  path: /lab-migration/manage-proposal/pending-solution
   defaults:
     _title: 'Pending Solution'
     _controller: '\Drupal\lab_migration\Controller\DefaultController::lab_migration_proposal_pending_solution'
   requirements:
     _permission: 'lab migration manage proposal'
 lab_migration.proposal_all:
-  path: /lab_migration/manage-proposal/all
+  path: /lab-migration/manage-proposal/all
   defaults:
     _title: 'All Proposals'
     _controller: '\Drupal\lab_migration\Controller\DefaultController::lab_migration_proposal_all'
   requirements:
     _permission: 'lab migration manage proposal'
 lab_migration.category_all:
-  path: /lab_migration/manage-proposal/category
+  path: /lab-migration/manage-proposal/category
   defaults:
     _title: Category
     _controller: '\Drupal\lab_migration\Controller\DefaultController::lab_migration_category_all'
   requirements:
     _permission: 'lab migration manage proposal'
 lab_migration.category_edit_form:
-  path: /lab_migration/manage-proposal/category/edit/{id}
+  path: /lab-migration/manage-proposal/category/edit/{id}
   defaults:
     _title: 'Edit Category'
     _form: \Drupal\lab_migration\Form\LabMigrationCategoryEditForm
   requirements:
     _permission: 'lab migration edit proposal'
 lab_migration.manage_proposal_approve:
-  path: /lab_migration/manage-proposal/approve/{id}
+  path: /lab-migration/manage-proposal/approve/{id}
   defaults:
     _title: 'Approve Proposal'
     _form: \Drupal\lab_migration\Form\LabMigrationProposalApprovalForm
   requirements:
     _permission: 'lab migration manage proposal'
 lab_migration.solution_proposal_approval_form:
-  path: /lab_migration/manage-proposal/solution-proposal-approve
+  path: /lab-migration/manage-proposal/solution-proposal-approve
   defaults:
     _title: 'Approve Solution Proposal'
     _form: \Drupal\lab_migration\Form\LabMigrationSolutionProposalApprovalForm
   requirements:
     _permission: 'lab migration manage proposal'
 lab_migration.proposal_edit_form:
-  path: /lab_migration/manage-proposal/edit/{id}
+  path: /lab-migration/manage-proposal/edit/{id}
   defaults:
     _title: 'Edit Proposal'
     _form: \Drupal\lab_migration\Form\LabMigrationProposalEditForm
   requirements:
     _permission: 'lab migration manage proposal'
 lab_migration.proposal_status_form:
-  path: /lab_migration/manage-proposal/status/{id}
+  path: /lab-migration/manage-proposal/status/{id}
   defaults:
     _title: 'Proposal Status'
     _form: \Drupal\lab_migration\Form\LabMigrationProposalStatusForm
   requirements:
     _permission: 'lab migration approve proposal' 
 lab_migration.proposal_open:
-  path: /lab_migration/open-proposal
+  path: /lab-migration/open-proposal
   defaults:
     _title: 'Lab Migration Solve'
     _controller: '\Drupal\lab_migration\Controller\DefaultController::lab_migration_proposal_open'
   requirements:
     _permission: 'lab migration propose solution'
 lab_migration.solution_proposal_form:
-  path: /lab_migration/show-proposal/{id}
+  path: /lab-migration/show-proposal/{id}
   defaults:
     _title: 'Lab Migration Solution Proposal'
     _form: \Drupal\lab_migration\Form\LabMigrationSolutionProposalForm
   requirements:
     _permission: 'lab migration propose solution'
 lab_migration.code_approval:
-  path: /lab_migration/code-approval
+  path: /lab-migration/code-approval
   defaults:
     _title: 'LM Manage Code Approval'
     _controller: '\Drupal\lab_migration\Controller\DefaultController::lab_migration_code_approval'
   requirements:
     _permission: 'lab migration approve code'
 lab_migration.code_approval_form:
-  path: /lab_migration/code-approval/approve/{solution_id}
+  path: /lab-migration/code-approval/approve/{solution_id}
   defaults:
     _title: 'Code Approval'
     _form: \Drupal\lab_migration\Form\LabMigrationCodeApprovalForm
   requirements:
     _permission: 'lab migration approve code'
 lab_migration.bulk_approval_form:
-  path: /lab_migration/code-approval/bulk
+  path: /lab-migration/code-approval/bulk
   defaults:
     _title: 'Bulk Manage'
     _form: \Drupal\lab_migration\Form\LabMigrationBulkApprovalForm
   requirements:
     _permission: 'lab migration bulk manage code'
 lab_migration.bulk_upload_code_form:
-  path: /lab_migration/code-approval/upload
+  path: /lab-migration/code-approval/upload
   defaults:
     _title: 'Upload Code'
     _form: \Drupal\lab_migration\Form\LabMigrationBulkUploadCodeForm
   requirements:
     _permission: 'lab migration bulk manage code'
 lab_migration.lab_notes_form:
-  path: /lab_migration/code-approval/notes
+  path: /lab-migration/code-approval/notes
   defaults:
     _title: 'Notes for Reviewers'
     _form: \Drupal\lab_migration\Form\LabMigrationLabNotesForm
   requirements:
     _permission: 'lab migration bulk manage code'
 lab_migration.list_experiments:
-  path: /lab_migration/code/list-experiments
+  path: /lab-migration/code/list-experiments
   defaults:
     _title: 'List Experiments'
     _controller: '\Drupal\lab_migration\Controller\DefaultController::lab_migration_list_experiments'
   requirements:
     _permission: 'lab migration upload code'
 lab_migration.upload_code_form:
-  path: /lab_migration/code/upload
+  path: /lab-migration/code/upload
   defaults:
     _title: 'Code Submission'
     _form: \Drupal\lab_migration\Form\LabMigrationUploadCodeForm
   requirements:
     _permission: 'lab migration upload code'
 lab_migration.upload_code_delete:
-  path: /lab_migration/code/delete/{solution_id}
+  path: /lab-migration/code/delete/{solution_id}
   defaults:
     _title: 'Delete Solution'
     _controller: '\Drupal\lab_migration\Controller\DefaultController::lab_migration_upload_code_delete'
   requirements:
     _permission: 'lab migration upload code'
 lab_migration.download_solution_file:
-  path: /lab_migration/download/file/{solution_file_id}
+  path: /lab-migration/download/file/{solution_file_id}
   defaults:
     _title: 'Code Download'
     _controller: '\Drupal\lab_migration\Controller\DefaultController::lab_migration_download_solution_file'
   requirements:
     _permission: 'lab migration download code'
 lab_migration.download_solution:
-  path: /lab_migration/download/solution/{solution_id}
+  path: /lab-migration/download/solution/{solution_id}
   defaults:
     _title: 'Code Download'
     _controller: '\Drupal\lab_migration\Controller\DefaultController::lab_migration_download_solution'
   requirements:
     _permission: 'lab migration download code'
 lab_migration.download_experiment:
-  path: /lab_migration/download/experiment/{experiment_id}
+  path: /lab-migration/download/experiment/{experiment_id}
   defaults:
     _title: 'Code Download'
     _controller: '\Drupal\lab_migration\Controller\DefaultController::lab_migration_download_experiment'
   requirements:
     _permission: 'lab migration download code'
 lab_migration.download_lab:
-  path: /lab_migration/download/lab/{lab_id}
+  path: /lab-migration/download/lab/{lab_id}
   defaults:
     _title: 'Code Download'
     _controller: '\Drupal\lab_migration\Controller\DefaultController::lab_migration_download_lab'
   requirements:
     _permission: 'lab migration download code'
 lab_migration.download_full_experiment:
-  path: /lab_migration/full-download/experiment
+  path: /lab-migration/full-download/experiment
   defaults:
     _title: 'Code Download'
     _controller: '\Drupal\lab_migration\Controller\DefaultController::lab_migration_download_full_experiment'
   requirements:
     _permission: 'lab migration approve code'
 lab_migration.download_full_lab:
-  path: /lab_migration/full-download/lab/{lab_id}
+  path: /lab-migration/full-download/lab/{lab_id}
   defaults:
     _title: 'Code Download'
     _controller: '\Drupal\lab_migration\Controller\DefaultController::lab_migration_download_full_lab'
   requirements:
     _permission: 'lab migration approve code'
 lab_migration.completed_labs_all:
-  path: /lab_migration/completed-labs
+  path: /lab-migration/completed-labs
   defaults:
     _title: 'Completed Labs'
     _controller: '\Drupal\lab_migration\Controller\DefaultController::lab_migration_completed_labs_all'
   requirements:
     _permission: 'lab migration download code'
 lab_migration.labs_progress_all:
-  path: /lab_migration/labs-progress
+  path: /lab-migration/labs-progress
   defaults:
     _title: 'Labs in Progress'
     _controller: '\Drupal\lab_migration\Controller\DefaultController::lab_migration_labs_progress_all'
   requirements:
     _permission: 'lab migration download code'
 lab_migration.run_form:
-  path: /lab_migration/lab_migration-run/{url_lab_id?}
+  path: /lab-migration/lab-migration-run/{url_lab_id?}
   defaults:
     _title: 'Download Codes'
     _form: \Drupal\lab_migration\Form\LabMigrationRunForm
   requirements:
     _permission: 'lab migration download code'
 lab_migration.download_lab_pdf:
-  path: /lab_migration/generate-lab
+  path: /lab-migration/generate-lab
   defaults:
     _title: 'Generate Lab'
     _controller: '\Drupal\lab_migration\Controller\DefaultController::lab_migration_download_lab_pdf'
   requirements:
     _permission: 'lab migration generate lab'
 lab_migration.delete_lab_pdf:
-  path: /lab_migration/delete-lab
+  path: /lab-migration/delete-lab
   defaults:
     _title: 'Delete Lab PDF'
     _controller: '\Drupal\lab_migration\Controller\DefaultController::lab_migration_delete_lab_pdf'
   requirements:
     _permission: 'lab migration approve code'
 lab_migration.settings_form:
-  path: /admin/settings/lab_migration
+  path: /admin/settings/lab-migration
   defaults:
     _title: 'Lab Migration Settings'
     _form: \Drupal\lab_migration\Form\LabMigrationSettingsForm
@@ -237,56 +237,56 @@ lab_migration.lab_bulk_manage_exp_ajax:
   requirements:
     _permission: 'lab migration bulk manage code'
 lab_migration._list_all_lm_certificates:
-  path: /lab_migration/certificate
+  path: /lab-migration/certificate
   defaults:
     _title: 'List Of All Certificates LM'
     _controller: '\Drupal\lab_migration\Controller\DefaultController::_list_all_lm_certificates'
   requirements:
     _permission: 'Create custom Certificate'
 lab_migration.certificate_form:
-  path: /lab_migration/certificate/lm-proposer/form
+  path: /lab-migration/certificate/lm-proposer/form
   defaults:
     _title: 'Create Certificate'
     _form: \Drupal\lab_migration\Form\LabMigrationCertificateForm
   requirements:
     _permission: 'Create custom Certificate'
 lab_migration.certificate_edit_form:
-  path: /lab_migration/certificate/lm-proposer/form/edit
+  path: /lab-migration/certificate/lm-proposer/form/edit
   defaults:
     _title: 'Edit Proposer Certificate'
     _form: \Drupal\lab_migration\Form\LabMigrationCertificateEditForm
   requirements:
     _permission: 'Create custom Certificate'
 lab_migration.certificate_participation_form:
-  path: /lab_migration/certificate/lm-participation/form
+  path: /lab-migration/certificate/lm-participation/form
   defaults:
     _title: 'Create Certificates for Participation'
     _form: \Drupal\lab_migration\Form\LabMigrationCertificateParticipationForm
   requirements:
     _permission: 'Create custom Certificate'
 lab_migration.certificate_participation_edit_form:
-  path: /lab_migration/certificate/lm-participation/form/edit
+  path: /lab-migration/certificate/lm-participation/form/edit
   defaults:
     _title: 'Edit Certificates for Participation'
     _form: \Drupal\lab_migration\Form\LabMigrationCertificateParticipationEditForm
   requirements:
     _permission: 'Create custom Certificate'
 lab_migration.generate_lm_pdf:
-  path: /lab_migration/certificate/generate-pdf
+  path: /lab-migration/certificate/generate-pdf
   defaults:
     _title: 'Download Certificate'
     _form: \Drupal\lab_migration\Form\GenerateLmPdf
   requirements:
     _permission: 'Create custom Certificate'
 lab_migration.verify_lab_migration_certificates:
-  path: /lab_migration/certificates/verify
+  path: /lab-migration/certificates/verify
   defaults:
     _title: 'Lab Migration Certificate Verification'
     _controller: '\Drupal\lab_migration\Controller\DefaultController::verify_lab_migration_certificates'
   requirements:
     _permission: 'Verify custom Certificate of lab'
 lab_migration.download_syllabus_copy:
-  path: /lab_migration/download/syllabus-copy-file/{proposal_id}
+  path: /lab-migration/download/syllabus-copy-file/{proposal_id}
   defaults:
     _title: 'Syllabus Copy Download'
     _controller: '\Drupal\lab_migration\Controller\DefaultController::lab_migration_download_syllabus_copy'
diff --git a/src/Controller/DefaultController.php b/src/Controller/DefaultController.php
index 0a40954..00d16e7 100755
--- a/src/Controller/DefaultController.php
+++ b/src/Controller/DefaultController.php
@@ -267,7 +267,7 @@ class DefaultController extends ControllerBase {
         foreach ($proposal_data_array as $proposal_data) {
             // $proposal_link = Link::fromTextAndUrl(
             //     $proposal_data->lab_title, 
-            //     Url::fromRoute('/lab_migration/open-proposal', ['id' => $proposal_data->id])
+            //     Url::fromRoute('/lab-migration/open-proposal', ['id' => $proposal_data->id])
             // );
             $apply_link = Link::fromTextAndUrl(
                 'Apply', 
@@ -506,7 +506,7 @@ $link = Link::fromTextAndUrl(t('Edit'), $url)->toString();
           '#type' => 'markup',
           '#markup' => Link::fromTextAndUrl(
             'Click here to download uploaded syllabus copy', 
-            Url::fromRoute('/lab_migration/download/syllabus-copy-file', ['proposal_id' => $proposal_id])
+            Url::fromRoute('/lab-migration/download/syllabus-copy-file', ['proposal_id' => $proposal_id])
           )->toString() . '<br><br>',
         ];
     } //$row->samplefilepath != "None"
@@ -660,7 +660,7 @@ $link = Link::fromTextAndUrl(t('Edit'), $url)->toString();
                 date('d-m-Y', $proposal_data->creation_date),
                 // $link = Link::fromTextAndUrl(
                 //   $proposal_data->name,
-                //   Url::fromUri('internal:/lab_migration/proposal' . $proposal_data->uid)
+                //   Url::fromUri('internal:/lab-migration/proposal' . $proposal_data->uid)
                 // )->toRenderable(),
               // l($proposal_data->name, 'user/' . $proposal_data->uid),
               Link::fromTextAndUrl($proposal_data->name, Url::fromRoute('entity.user.canonical', ['user' => $proposal_data->uid])),
@@ -669,9 +669,9 @@ $link = Link::fromTextAndUrl(t('Edit'), $url)->toString();
                 $proposal_data->department,
                 $proposal_data->category,
                 $edit_url,
-//                 $url = Url::fromUri('internal:/lab_migration/manage-proposal/category/edit' . $proposal_data->id),
+//                 $url = Url::fromUri('internal:/lab-migration/manage-proposal/category/edit' . $proposal_data->id),
 // $link = Link::fromTextAndUrl('Edit/Category', $url),
-                // Link::fromTextAndUrl('Edit Category', '/lab_migration/manage-proposal/category/edit' . $proposal_data->id)
+                // Link::fromTextAndUrl('Edit Category', '/lab-migration/manage-proposal/category/edit' . $proposal_data->id)
             );
           }
         $proposal_header = array(
@@ -715,7 +715,7 @@ $link = Link::fromTextAndUrl(t('Edit'), $url)->toString();
       \Drupal::messenger()->addMessage('Invalid solution.', 'error');
       // RedirectResponse('lab-migration/code');
       // return new RedirectResponse('/lab-migration/code/list-experiments');
-      $response = new RedirectResponse(Url::fromRoute('/lab_migration/code/list-experiments')->toString());
+      $response = new RedirectResponse(Url::fromRoute('/lab-migration/code/list-experiments')->toString());
       // Send the redirect response
          //$response->send();
 
@@ -925,7 +925,7 @@ $solution_id = (int) $route_match->getParameter('solution_id');
       \Drupal::messenger()->addMessage("There are no files in this solutions to download", 'error');
      
       // RedirectResponse('lab-migration/lab-migration-run');
-      return new RedirectResponse(Url::fromUserInput('/lab_migration/lab_migration-run')->toString());
+      return new RedirectResponse(Url::fromUserInput('/lab-migration/lab-migration-run')->toString());
     }
   }
 
@@ -1000,7 +1000,7 @@ $root_path = \Drupal::service("lab_migration_global")->lab_migration_path();
 return new Response('', Response::HTTP_NO_CONTENT);
 
       // RedirectResponse('lab-migration/lab-migration-run');
-      $response = new RedirectResponse('/lab_migration/lab_migration-run');
+      $response = new RedirectResponse('/lab-migration/lab-migration-run');
 $response->send();
     }
   }
@@ -1314,7 +1314,7 @@ $root_path = \Drupal::service("lab_migration_global")->lab_migration_path();
     else {
       \Drupal::messenger()->addMessage("There are no solutions in this lab to download", 'error');
       // return new Response('lab-migration/code-approval/bulk');
-      return new RedirectResponse('/lab_migration/code-approval/bulk');
+      return new RedirectResponse('/lab-migration/code-approval/bulk');
       
     }
   }
@@ -1841,7 +1841,7 @@ public function lab_migration_list_experiments() {
         // Action link for 'Delete' if approval status is pending.
         $action_link = '';
         if ($solution_data->approval_status == 0) {
-          $delete_url = Url::fromUri('internal:/lab_migration/code/delete/' . $solution_data->id);
+          $delete_url = Url::fromUri('internal:/lab-migration/code/delete/' . $solution_data->id);
           //Url::fromRoute('lab_migration.upload_code_delete', ['id' => $solution_data->id]);
           $action_link = Link::fromTextAndUrl('Delete', $delete_url)->toString();
         }
@@ -1867,7 +1867,7 @@ public function lab_migration_list_experiments() {
             $filetype_map = ['S' => 'Source', 'R' => 'Result', 'X' => 'Xcox', 'U' => 'Unknown'];
             $code_file_type = $filetype_map[$solution_files_data->filetype] ?? 'Unknown';
 
-            $download_url = Url::fromUri('internal:/lab_migration/download/file/' . $solution_files_data->id);
+            $download_url = Url::fromUri('internal:/lab-migration/download/file/' . $solution_files_data->id);
             $experiment_rows[] = [
              
               Link::fromTextAndUrl($solution_files_data->filename, $download_url)->toString(),
@@ -1939,7 +1939,7 @@ public function lab_migration_completed_labs_all() {
       $approval_date = date("Y", $row->approval_date);
 
       // Create a URL for the lab title link.
-      $url = Url::fromUri('internal:/lab_migration/lab_migration-run/' . $row->id);
+      $url = Url::fromUri('internal:/lab-migration/lab-migration-run/' . $row->id);
       $link = Link::fromTextAndUrl($row->lab_title, $url)->toString();
 
       $preference_rows[] = [
diff --git a/src/Form/LabMigrationBulkApprovalForm.php b/src/Form/LabMigrationBulkApprovalForm.php
index 0ae521c..0f79c76 100755
--- a/src/Form/LabMigrationBulkApprovalForm.php
+++ b/src/Form/LabMigrationBulkApprovalForm.php
@@ -78,7 +78,7 @@ class LabMigrationBulkApprovalForm extends FormBase {
       '#type' => 'markup',
       '#markup' => Link::fromTextAndUrl(
         $this->t('Download'),
-        Url::fromUri('internal:/lab_migration/full-download/lab/' . $lab_default_value)
+        Url::fromUri('internal:/lab-migration/full-download/lab/' . $lab_default_value)
       )->toString() . ' ' . $this->t('(Download all the approved and unapproved solutions of the entire lab)'),
       // '#states' => [
       //     'invisible' => [
@@ -126,7 +126,7 @@ class LabMigrationBulkApprovalForm extends FormBase {
   ];
   $form['download_experiment_wrapper']['download_experiment'] = [
     '#type' => 'item',
-    '#markup' => Link::fromTextAndUrl('Download Experiment', Url::fromUri('internal:/lab_migration/download/experiment/' . $form_state->getValue('lab_experiment_list')))->toString()
+    '#markup' => Link::fromTextAndUrl('Download Experiment', Url::fromUri('internal:/lab-migration/download/experiment/' . $form_state->getValue('lab_experiment_list')))->toString()
 ];
    $form['download_experiment_wrapper']['lab_experiment_actions'] = [
       '#type' => 'select',
@@ -160,7 +160,7 @@ $form['download_solution_wrapper'] = [
 ];
 $form['download_solution_wrapper']['download_solution'] = [
   '#type' => 'item',
-  '#markup' => Link::fromTextAndUrl('Download Solution', Url::fromUri('internal:/lab_migration/download/solution/' . $form_state->getValue('solution_list')))->toString()
+  '#markup' => Link::fromTextAndUrl('Download Solution', Url::fromUri('internal:/lab-migration/download/solution/' . $form_state->getValue('solution_list')))->toString()
 ];
 $form['download_solution_wrapper']['lab_experiment_solution_actions'] = [
   '#type' => 'select',
@@ -270,7 +270,7 @@ $query = \Drupal::database()->select('lab_migration_solution_files', 's');
         // Create file download link
         $items = [
          
-           Link::fromTextAndUrl($solution_list_data->filename, Url::fromUri('internal:/lab_migration/download/file/' . $solution_list_data->id))->toString(),
+           Link::fromTextAndUrl($solution_list_data->filename, Url::fromUri('internal:/lab-migration/download/file/' . $solution_list_data->id))->toString(),
           "{$solution_file_type}"
         ];
       }
@@ -536,7 +536,7 @@ public function _bulk_list_experiment_actions()
               $experiment_list .= '</p>';
             }
             $msg = \Drupal::messenger()->addmessage(t('Approved Entire Lab. Click on the checkbox below to mark this lab completed'), 'status');
-            // fromUri('internal:/lab_migration/manage-proposal/status/' . $form_state->getValue(['lab']))
+            // fromUri('internal:/lab-migration/manage-proposal/status/' . $form_state->getValue(['lab']))
             /* email */
 //             $email_subject = t('[!site_name] Your uploaded Lab Migration solutions have been approved', [
 //               '!site_name' => $config->get('site_name', '')
diff --git a/src/Form/LabMigrationCertificateEditForm.php b/src/Form/LabMigrationCertificateEditForm.php
index dd110aa..b749d71 100755
--- a/src/Form/LabMigrationCertificateEditForm.php
+++ b/src/Form/LabMigrationCertificateEditForm.php
@@ -98,7 +98,7 @@ $certi_id = (int) $route_match->getParameter('certi_id');
         $form['proposal_id'] = [
           '#type' => 'textfield',
           '#title' => t('Lab Proposal Id'),
-          '#description' => 'Note: You can find it in respective completed labs url -> scilab.in/lab_migration_run/64 <- this number is the proposal id for respective lab',
+          '#description' => 'Note: You can find it in respective completed labs url -> freecad.fossee.in/lab-migration/lab-migration-run/64 <- this number is the proposal id for respective lab',
           '#default_value' => $details_list->proposal_id,
         ];
         $form['certi_id'] = [
diff --git a/src/Form/LabMigrationCertificateForm.php b/src/Form/LabMigrationCertificateForm.php
index 5bd0578..97abfc3 100755
--- a/src/Form/LabMigrationCertificateForm.php
+++ b/src/Form/LabMigrationCertificateForm.php
@@ -75,7 +75,7 @@ class LabMigrationCertificateForm extends FormBase {
     $form['proposal_id'] = [
       '#type' => 'textfield',
       '#title' => t('Lab Proposal Id'),
-      '#description' => 'Note: You can find  the respective Lab Proposal Id from the url for the  completed lab. For example: The Lab Proposal Id is 64 for this completed lab. ( Url - scilab.in/lab_migration_run/64)',
+      '#description' => 'Note: You can find  the respective Lab Proposal Id from the url for the  completed lab. For example: The Lab Proposal Id is 64 for this completed lab. ( Url - freecad.fossee.in/lab-migration/lab-migration-run/64)',
       '#required' => TRUE,
     ];
     $form['submit'] = [
diff --git a/src/Form/LabMigrationCertificateParticipationEditForm.php b/src/Form/LabMigrationCertificateParticipationEditForm.php
index 4d50fcb..edda896 100755
--- a/src/Form/LabMigrationCertificateParticipationEditForm.php
+++ b/src/Form/LabMigrationCertificateParticipationEditForm.php
@@ -96,7 +96,7 @@ $certi_id = (int) $route_match->getParameter('certi_id');
         $form['proposal_id'] = [
           '#type' => 'textfield',
           '#title' => t('Lab Proposal Id'),
-          '#description' => 'Note: You can find  the respective Lab Proposal Id from the url for the  completed lab. For example: The Lab Proposal Id is 64 for this completed lab. ( Url - scilab.in/lab_migration_run/64)',
+          '#description' => 'Note: You can find  the respective Lab Proposal Id from the url for the  completed lab. For example: The Lab Proposal Id is 64 for this completed lab. ( Url - freecad.fossee.in/lab-migration/lab-migration-run/64)',
           '#default_value' => $details_list->proposal_id,
         ];
         $form['certi_id'] = [
diff --git a/src/Form/LabMigrationCertificateParticipationForm.php b/src/Form/LabMigrationCertificateParticipationForm.php
index 262bce5..03ceb63 100755
--- a/src/Form/LabMigrationCertificateParticipationForm.php
+++ b/src/Form/LabMigrationCertificateParticipationForm.php
@@ -73,7 +73,7 @@ class LabMigrationCertificateParticipationForm extends FormBase {
     $form['proposal_id'] = [
       '#type' => 'textfield',
       '#title' => t('Lab Proposal Id'),
-      '#description' => 'Note: You can find  the respective Lab Proposal Id from the url for the  completed lab. For example: The Lab Proposal Id is 64 for this completed lab. ( Url - scilab.in/lab_migration_run/64)',
+      '#description' => 'Note: You can find  the respective Lab Proposal Id from the url for the  completed lab. For example: The Lab Proposal Id is 64 for this completed lab. ( Url - freecad.fossee.in/lab-migration/lab-migration-run/64)',
       '#required' => TRUE,
     ];
     $form['submit'] = [
diff --git a/src/Form/LabMigrationCodeApprovalForm.php b/src/Form/LabMigrationCodeApprovalForm.php
index c5168ab..5deb242 100755
--- a/src/Form/LabMigrationCodeApprovalForm.php
+++ b/src/Form/LabMigrationCodeApprovalForm.php
@@ -147,7 +147,7 @@ return $response;
             $code_file_type = 'Unknown';
             break;
         }
-        $url = Url::fromUri('internal:/lab_migration/download/solution/' . $solution_files_data->id);
+        $url = Url::fromUri('internal:/lab-migration/download/solution/' . $solution_files_data->id);
 
 // Create the link with Link::fromTextAndUrl.
 $link = Link::fromTextAndUrl($solution_files_data->filename, $url)->toString();
diff --git a/src/Form/LabMigrationProposalApprovalForm.php b/src/Form/LabMigrationProposalApprovalForm.php
index 8059257..1d3a29e 100755
--- a/src/Form/LabMigrationProposalApprovalForm.php
+++ b/src/Form/LabMigrationProposalApprovalForm.php
@@ -162,7 +162,7 @@ $proposal_id = (int) $route_match->getParameter('id');
         // '#markup' => Link::fromTextAndUrl(t('Click here to download uploaded syllabus copy'), 'lab-migration/download/syllabus-copy-file/' . $proposal_id,$Url) ,
       '#markup' => Link::fromTextAndUrl(
   $this->t('Click here to download uploaded syllabus copy'),
-  Url::fromUri('internal:/lab_migration/download/syllabus-copy-file/' . $proposal_id)
+  Url::fromUri('internal:/lab-migration/download/syllabus-copy-file/' . $proposal_id)
 )->toString(),
         // var_dump( $proposal_id );die;
       ];
@@ -229,7 +229,7 @@ $proposal_id = (int) $route_match->getParameter('id');
       // '#markup' =>Link::fromTextAndUrl(t('Cancel'), 'lab-migration/manage-proposal'),
       '#markup' => Link::fromTextAndUrl(
   $this->t('Cancel'),
-  Url::fromUri('internal:/lab_migration/manage-proposal/pending'))->toString(),
+  Url::fromUri('internal:/lab-migration/manage-proposal/pending'))->toString(),
 
     ];
     return $form;
diff --git a/src/Form/LabMigrationProposalForm.php b/src/Form/LabMigrationProposalForm.php
index 7899327..a21c109 100755
--- a/src/Form/LabMigrationProposalForm.php
+++ b/src/Form/LabMigrationProposalForm.php
@@ -72,7 +72,7 @@ class LabMigrationProposalForm extends FormBase {
   $response->send();
   return $msg;
 
-  // /lab_migration/proposal
+  // /lab-migration/proposal
     }
     $query = \Drupal::database()->select('lab_migration_proposal');
     $query->fields('lab_migration_proposal');
diff --git a/src/Form/LabMigrationRunForm.php b/src/Form/LabMigrationRunForm.php
index 164cee0..8cc6da9 100755
--- a/src/Form/LabMigrationRunForm.php
+++ b/src/Form/LabMigrationRunForm.php
@@ -75,7 +75,7 @@ class LabMigrationRunForm extends FormBase {
               '#markup' => 
                 Link::fromTextAndUrl(
                   $this->t('Download Lab Solutions'), 
-                  Url::fromUri('internal:/lab_migration/download/lab/' . $lab_default_value)
+                  Url::fromUri('internal:/lab-migration/download/lab/' . $lab_default_value)
                 )->toString()
             ];
         $form['download_lab_wrapper']['lab_details'] = array(
@@ -107,7 +107,7 @@ class LabMigrationRunForm extends FormBase {
         ];
         $form['download_experiment_wrapper']['download_experiment'] = [
             '#type' => 'item',
-            '#markup' => Link::fromTextAndUrl('Download Experiment', Url::fromUri('internal:/lab_migration/download/experiment/' . $form_state->getValue('lab_experiment_list')))->toString()
+            '#markup' => Link::fromTextAndUrl('Download Experiment', Url::fromUri('internal:/lab-migration/download/experiment/' . $form_state->getValue('lab_experiment_list')))->toString()
         ];
         $form['download_experiment_wrapper']['solution_list'] = [
           '#type' => 'select',
@@ -126,7 +126,7 @@ class LabMigrationRunForm extends FormBase {
         ];
         $form['download_solution_wrapper']['download_solution'] = [
           '#type' => 'item',
-          '#markup' => Link::fromTextAndUrl('Download Solution', Url::fromUri('internal:/lab_migration/download/solution/' . $form_state->getValue('solution_list')))->toString()
+          '#markup' => Link::fromTextAndUrl('Download Solution', Url::fromUri('internal:/lab-migration/download/solution/' . $form_state->getValue('solution_list')))->toString()
         ];
       //   if ($solution_list_default_value != 0) {
       //     //       // Render experiment solution actions
@@ -161,7 +161,7 @@ class LabMigrationRunForm extends FormBase {
           // Create file download link
           $items = [
            
-             Link::fromTextAndUrl($solution_list_data->filename, Url::fromUri('internal:/lab_migration/download/file/' . $solution_list_data->id))->toString(),
+             Link::fromTextAndUrl($solution_list_data->filename, Url::fromUri('internal:/lab-migration/download/file/' . $solution_list_data->id))->toString(),
             "{$solution_file_type}"
           ];
         }
@@ -217,7 +217,7 @@ $form['download_solution_wrapper']['solution_files']['table'] = $table;
       
 //       // 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_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);
diff --git a/src/Form/LabMigrationSolutionProposalForm.php b/src/Form/LabMigrationSolutionProposalForm.php
index 49e25aa..a911ece 100755
--- a/src/Form/LabMigrationSolutionProposalForm.php
+++ b/src/Form/LabMigrationSolutionProposalForm.php
@@ -299,7 +299,7 @@ return $response;
     if ($solution_provider_q->fetchObject()) {
       $form_state->setErrorByName('', t("You have already applied for a solution. Please compelete that before applying for another solution."));
       // RedirectResponse('lab-migration/open-proposal');
-      $response = new RedirectResponse('/lab_migration/open-proposal');
+      $response = new RedirectResponse('/lab-migration/open-proposal');
       $response->send();
     }
   }
@@ -322,13 +322,13 @@ return $response;
     if (!$proposal_data) {
       \Drupal::messenger()->addmessage("Invalid proposal.", 'error');
       // RedirectResponse('/lab-migration/open-proposal');
-      $response = new RedirectResponse('/lab_migration/open-proposal');
+      $response = new RedirectResponse('/lab-migration/open-proposal');
       $response->send();
     }
     if ($proposal_data->solution_provider_uid != 0) {
       \Drupal::messenger()->addmessage("Someone has already applied for solving this Lab.", 'error');
       // RedirectResponse('lab-migration/open-proposal');
-      $response = new RedirectResponse('/lab_migration/open-proposal');
+      $response = new RedirectResponse('/lab-migration/open-proposal');
       $response->send();
     }
     $query = "UPDATE {lab_migration_proposal} set solution_provider_uid = :uid, solution_status = :solution_status, solution_provider_name_title = :solution_provider_name_title, solution_provider_name = :solution_provider_contact_name, solution_provider_contact_ph = :solution_provider_contact_ph, solution_provider_department = :solution_provider_department, solution_provider_university = :solution_provider_university , solution_provider_city = :solution_provider_city, solution_provider_pincode = :solution_provider_pincode, solution_provider_state = :solution_provider_state,solution_provider_country = :solution_provider_country, version = :freecad_version WHERE id = :proposal_id";