From 72d65529d4443634ce99c58aa50732d7e09fccf6 Mon Sep 17 00:00:00 2001
From: Saketh1499
Date: Mon, 9 Aug 2021 13:56:46 +0530
Subject: Updating country fields in proposal form
---
lab_migration.module | 57 ++++++++++++++++++-
manage_proposal.inc | 63 ++++++++++++++++++---
proposal.inc | 151 ++++++++++++++++++++++++++++++++++++++++++++++-----
3 files changed, 248 insertions(+), 23 deletions(-)
diff --git a/lab_migration.module b/lab_migration.module
index cf40af6..6a861a1 100755
--- a/lab_migration.module
+++ b/lab_migration.module
@@ -836,7 +836,59 @@ function lm_ucname($string)
}
return $string;
}
-
+
+ function _lab_migration_list_of_city_pincode($city=Null, $state=NULL, $district=NULL)
+{
+ $pincode = array();
+ if($city){
+ $pincode_list = db_query("SELECT pincode FROM all_india_pincode WHERE city = :city AND state = :state AND district = :district", array(':city' => $city,':state'=> $state, ':district' => $district));
+ while ($pincode_list_data = $pincode_list->fetchObject())
+ {
+ $pincode[$pincode_list_data->pincode] = $pincode_list_data->pincode;
+ }
+ }
+ else{
+ $pincode[000000] = '000000';
+ }
+ return $pincode;
+}
+
+function _lab_migration_list_of_cities($state=Null, $district=NULL)
+{
+ $city = array(''=> '- Select -');
+ if($state){
+ $city_list = db_query("SELECT city FROM all_india_pincode WHERE state = :state AND district = :district ORDER BY city ASC", array(':state'=> $state, ':district' =>$district));
+ while ($city_list_data = $city_list->fetchObject())
+ {
+ $city[$city_list_data->city] = $city_list_data->city;
+ }
+ }
+ return $city;
+}
+
+function _lab_migration_list_of_district($state=Null)
+{
+ $district = array(''=> '- Select -');
+ if($state){
+ $district_list = db_query("SELECT district FROM all_india_pincode WHERE state = :state ORDER BY district ASC", array(':state'=> $state));
+ while ($district_list_data = $district_list->fetchObject())
+ {
+ $district[$district_list_data->district] = $district_list_data->district;
+ }
+ }
+ return $district;
+}
+
+function _lab_migration_list_of_states()
+{
+ $states = array(''=> '- Select -');
+ $states_list = db_query("SELECT state FROM all_india_pincode WHERE country = 'India' ORDER BY state ASC");
+ while ($states_list_data = $states_list->fetchObject())
+ {
+ $states[$states_list_data->state] = $states_list_data->state;
+ }
+ return $states;
+}
function _lm_list_of_states()
{
$states = array(0 => '-Select-');
@@ -930,7 +982,8 @@ function _list_all_lm_certificates()
'Institute name',
'Name',
'Type',
- 'Download Certificates'
+ 'Download Certificates',
+ 'Edit Certificates'
);
$output .= theme('table', array(
'header' => $search_header,
diff --git a/manage_proposal.inc b/manage_proposal.inc
index 1a140d0..b9071ab 100755
--- a/manage_proposal.inc
+++ b/manage_proposal.inc
@@ -248,6 +248,11 @@ function lab_migration_proposal_approval_form($form, $form_state)
'#markup' => $proposal_data->city,
'#title' => t('City')
);
+ $form['district'] = array(
+ '#type' => 'item',
+ '#markup' => $proposal_data->district,
+ '#title' => t('District')
+ );
$form['pincode'] = array(
'#type' => 'item',
'#markup' => $proposal_data->pincode,
@@ -499,6 +504,31 @@ function lab_migration_proposal_status_form($form, $form_state)
'#markup' => $proposal_data->university,
'#title' => t('University/Institute')
);
+ $form['country'] = array(
+ '#type' => 'item',
+ '#markup' => $proposal_data->country,
+ '#title' => t('Country')
+ );
+ $form['all_state'] = array(
+ '#type' => 'item',
+ '#markup' => $proposal_data->state,
+ '#title' => t('State')
+ );
+ $form['city'] = array(
+ '#type' => 'item',
+ '#markup' => $proposal_data->city,
+ '#title' => t('City')
+ );
+ $form['district'] = array(
+ '#type' => 'item',
+ '#markup' => $proposal_data->district,
+ '#title' => t('District')
+ );
+ $form['pincode'] = array(
+ '#type' => 'item',
+ '#markup' => $proposal_data->pincode,
+ '#title' => t('Pincode/Postal code')
+ );
$form['lab_title'] = array(
'#type' => 'item',
'#markup' => $proposal_data->lab_title,
@@ -767,19 +797,19 @@ function lab_migration_proposal_edit_form($form, $form_state)
'India' => 'India',
'Others' => 'Others'
),
- '#default_value' => $proposal_data->country,
'#required' => TRUE,
'#tree' => TRUE,
- '#validated' => TRUE
+ '#validated' => TRUE,
+ '#default_value' => $proposal_data->country
);
$form['other_country'] = array(
'#type' => 'textfield',
'#title' => t('Other than India'),
'#size' => 100,
- '#default_value' => $proposal_data->country,
'#attributes' => array(
'placeholder' => t('Enter your country name')
),
+ '#default_value' => $proposal_data->country,
'#states' => array(
'visible' => array(
':input[name="country"]' => array(
@@ -823,9 +853,22 @@ function lab_migration_proposal_edit_form($form, $form_state)
$form['all_state'] = array(
'#type' => 'select',
'#title' => t('State'),
- '#options' => _lm_list_of_states(),
- '#default_value' => $proposal_data->state,
+ '#options' => _lab_migration_list_of_states(),
'#validated' => TRUE,
+ '#default_value' => $proposal_data->state,
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="country"]' => array(
+ 'value' => 'India'
+ )
+ )
+ )
+ );
+ $form['district'] = array(
+ '#type' => 'select',
+ '#title' => t('District'),
+ '#options' => _lab_migration_list_of_district(),
+ '#default_value' => $proposal_data->district,
'#states' => array(
'visible' => array(
':input[name="country"]' => array(
@@ -837,7 +880,7 @@ function lab_migration_proposal_edit_form($form, $form_state)
$form['city'] = array(
'#type' => 'select',
'#title' => t('City'),
- '#options' => _lm_list_of_cities(),
+ '#options' => _lab_migration_list_of_cities(),
'#default_value' => $proposal_data->city,
'#states' => array(
'visible' => array(
@@ -847,16 +890,19 @@ function lab_migration_proposal_edit_form($form, $form_state)
)
)
);
+
$form['pincode'] = array(
'#type' => 'textfield',
'#title' => t('Pincode'),
'#size' => 30,
'#maxlength' => 6,
'#default_value' => $proposal_data->pincode,
+ '#required' => False,
'#attributes' => array(
- 'placeholder' => 'Insert pincode of your city/ village....'
+ 'placeholder' => 'Enter pincode....'
)
- );
+ );
+
$form['lab_title'] = array(
'#type' => 'textfield',
'#title' => t('Title of the Lab'),
@@ -1129,6 +1175,7 @@ function lab_migration_proposal_edit_form_submit($form, &$form_state)
'department' => $v['department'],
'university' => $v['university'],
'city' => $v['city'],
+ 'district' => $v['district'],
'pincode' => $v['pincode'],
'state' => $v['all_state'],
'lab_title' => $v['lab_title'],
diff --git a/proposal.inc b/proposal.inc
index bc75e4c..85175f8 100755
--- a/proposal.inc
+++ b/proposal.inc
@@ -23,6 +23,15 @@ lab_migration_solution : approval_status
function lab_migration_proposal_form($form, &$form_state)
{
global $user;
+ $form = array();
+ $state = _lab_migration_list_of_states();
+ $selected_state = isset($form_state['values']['all_state'])?$form_state['values']['all_state']:key($state);
+ $district = _lab_migration_list_of_district();
+ $selected_district = isset($form_state['values']['district'])?$form_state['values']['district']:key($district);
+ $city = _lab_migration_list_of_cities();
+ $selected_city = isset($form_state['values']['city'])?$form_state['values']['city']:key($city);
+ $pincode = _lab_migration_list_of_city_pincode();
+ $selected_pincode = isset($form_state['values']['picode'])?$form_state['values']['pincode']:key($pincode);
/************************ start approve book details ************************/
if ($user->uid == 0) {
$msg = drupal_set_message(t('It is mandatory to ' . l('login', 'user') . ' on this website to access the lab proposal form. If you are new user please create a new account first.'), 'error');
@@ -101,13 +110,19 @@ function lab_migration_proposal_form($form, &$form_state)
'placeholder' => 'Insert full name of your institute/ university.... '
)
);
- $form['country'] = array(
+ $form['country'] = array(
'#type' => 'select',
'#title' => t('Country'),
'#options' => array(
'India' => 'India',
'Others' => 'Others'
),
+ //'#default_value' => 'India',
+ '#prefix' => '',
+ '#suffix' => '
',
+ // '#ajax' => array(
+ // 'callback' => 'ajax_get_lm_district_list_callback',
+ // ),
'#required' => TRUE,
'#tree' => TRUE,
'#validated' => TRUE
@@ -159,8 +174,17 @@ function lab_migration_proposal_form($form, &$form_state)
);
$form['all_state'] = array(
'#type' => 'select',
- '#title' => t('State'),
- '#options' => _lm_list_of_states(),
+ '#title' => t('State/UT'),
+ '#options' => _lab_migration_list_of_states(),
+ //'#empty_value' => '0',
+ //'#empty_option' => '- Select -',
+ '#default_value' => '0',
+ '#prefix' => '',
+ '#suffix' => '
',
+ '#required' => TRUE,
+ '#ajax' => array(
+ 'callback' => 'ajax_get_lm_district_list_callback',
+ ),
'#validated' => TRUE,
'#states' => array(
'visible' => array(
@@ -170,26 +194,64 @@ function lab_migration_proposal_form($form, &$form_state)
)
)
);
+ $form['district'] = array(
+ '#type' => 'select',
+ '#title' => t('District/Area'),
+ '#options' => _lab_migration_list_of_district($selected_state),
+ //'#empty_value' => '0',
+ //'#empty_option' => '- Select -',
+ '#prefix' => '',
+ '#suffix' => '
',
+ '#validated' => TRUE,
+ '#required' => TRUE,
+ '#ajax' => array(
+ 'callback' => 'ajax_get_lm_city_list_callback',
+ ),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="all_state"]' => array(
+ 'value' => 'India'
+ )
+ )
+ )
+ );
$form['city'] = array(
'#type' => 'select',
- '#title' => t('City'),
- '#options' => _lm_list_of_cities(),
+ '#title' => t('City/Area'),
+ '#options' => _lab_migration_list_of_cities($selected_state, $selected_district),
+ //'#empty_value' => '0',
+ //'#empty_option' => '- Select -',
+ '#prefix' => '',
+ '#suffix' => '
',
+ '#validated' => TRUE,
+ '#required' => TRUE,
+ '#ajax' => array(
+ 'callback' => 'ajax_get_lm_city_pincode_list_callback',
+ ),
'#states' => array(
'visible' => array(
- ':input[name="country"]' => array(
+ ':input[name="district"]' => array(
'value' => 'India'
)
)
)
);
$form['pincode'] = array(
- '#type' => 'textfield',
+ '#type' => 'select',
'#title' => t('Pincode'),
- '#size' => 30,
- '#maxlength' => 6,
+ '#options' => _lab_migration_list_of_city_pincode($selected_city, $selected_state, $selected_district),
+ '#prefix' => '',
+ '#suffix' => '
',
+ //'#empty_value' => '0',
+ //'#empty_option' => '- Select -',
'#required' => TRUE,
- '#attributes' => array(
- 'placeholder' => 'Enter pincode....'
+ '#validated' => TRUE,
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="city"]' => array(
+ 'value' => 'India'
+ )
+ )
)
);
/***************************************************************************/
@@ -430,8 +492,8 @@ function lab_migration_proposal_form_submit($form, &$form_state)
$university = $v['university'];
$directory_name = _lm_dir_name($lab_title, $proposar_name, $university);
$result = "INSERT INTO {lab_migration_proposal}
- (uid, approver_uid, name_title, name, contact_ph, department, university, city, pincode, state, country, r_version, lab_title, approval_status, solution_status, solution_provider_uid, solution_display, creation_date, approval_date, solution_date, solution_provider_name_title, solution_provider_name, solution_provider_contact_ph, solution_provider_department, solution_provider_university, directory_name) VALUES
- (:uid, :approver_uid, :name_title, :name, :contact_ph, :department, :university, :city, :pincode, :state, :country,
+ (uid, approver_uid, name_title, name, contact_ph, department, university, city, district, pincode, state, country, r_version, lab_title, approval_status, solution_status, solution_provider_uid, solution_display, creation_date, approval_date, solution_date, solution_provider_name_title, solution_provider_name, solution_provider_contact_ph, solution_provider_department, solution_provider_university, directory_name) VALUES
+ (:uid, :approver_uid, :name_title, :name, :contact_ph, :department, :university, :city, :district, :pincode, :state, :country,
:r_version, :lab_title, :approval_status, :solution_status, :solution_provider_uid, :solution_display, :creation_date,
:approval_date, :solution_date, :solution_provider_name_title, :solution_provider_name,
:solution_provider_contact_ph, :solution_provider_department, :solution_provider_university, :directory_name)";
@@ -444,6 +506,7 @@ function lab_migration_proposal_form_submit($form, &$form_state)
":department" => $v['department'],
":university" => $v['university'],
":city" => $v['city'],
+ ":district" => $v['district'],
":pincode" => $v['pincode'],
":state" => $v['all_state'],
":country" => $v['country'],
@@ -532,3 +595,65 @@ function _lm_dir_name($lab, $name, $university)
$directory_name = str_replace("__", "_", str_replace(" ", "_", $dir_name));
return $directory_name;
}
+
+function ajax_get_lm_city_list_callback($form, $form_state)
+{
+ $state_default_value = $form_state['values']['all_state'];
+ $district_default_value = $form_state['values']['district'];
+ if ($district_default_value != '0')
+ {
+ $form['city']['#options'] = _lab_migration_list_of_cities($state_default_value, $district_default_value);
+ $commands[] = ajax_command_replace("#ajax-city-list-replace", drupal_render($form['city']));
+ $form['pincode']['#options'] = array('0' => '- Select -');
+ $commands[] = ajax_command_replace("#ajax-pincode-list-replace", drupal_render($form['pincode']));
+ }else{
+ $form['city']['#options'] = array('0' => '- Select -');
+ $commands[] = ajax_command_replace("#ajax-city-list-replace", drupal_render($form['city']));
+ }
+ return array(
+ '#type' => 'ajax',
+ '#commands' => $commands
+ );
+}
+function ajax_get_lm_district_list_callback($form, $form_state)
+{
+ $state_default_value = $form_state['values']['all_state'];
+ if ($state_default_value != '0')
+ {
+ $form['district']['#options'] = _lab_migration_list_of_district($state_default_value);
+ $commands[] = ajax_command_replace("#ajax-district-list-replace", drupal_render($form['district']));
+ $form['pincode']['#options'] = array('0' =>'- Select -');
+ $commands[] = ajax_command_replace("#ajax-pincode-list-replace", drupal_render($form['pincode']));
+ $form['city']['#options'] = array('0' => '- Select -');
+ $commands[] = ajax_command_replace("#ajax-city-list-replace", drupal_render($form['city']));
+ }else{
+ $form['district']['#options'] = array('0' => '- Select -');
+ $commands[] = ajax_command_replace("#ajax-district-list-replace", drupal_render($form['district']));
+ $form['pincode']['#options'] = array('0' =>'- Select -');
+ $commands[] = ajax_command_replace("#ajax-pincode-list-replace", drupal_render($form['pincode']));
+ $form['city']['#options'] = array('0' => '- Select -');
+ $commands[] = ajax_command_replace("#ajax-city-list-replace", drupal_render($form['city']));
+ }
+ return array(
+ '#type' => 'ajax',
+ '#commands' => $commands
+ );
+}
+function ajax_get_lm_city_pincode_list_callback($form, $form_state)
+{
+ $city_default_value = $form_state['values']['city'];
+ $state_default_value = $form_state['values']['all_state'];
+ $district_default_value = $form_state['values']['district'];
+ if ($city_default_value != '0')
+ {
+ $form['pincode']['#options'] = _lab_migration_list_of_city_pincode($city_default_value,$state_default_value,$district_default_value);
+ $commands[] = ajax_command_replace("#ajax-pincode-list-replace", drupal_render($form['pincode']));
+ }else{
+ $form['pincode']['#options'] = array('0' => '- Select -');
+ $commands[] = ajax_command_replace("#ajax-pincode-list-replace", drupal_render($form['pincode']));
+ }
+ return array(
+ '#type' => 'ajax',
+ '#commands' => $commands
+ );
+}
\ No newline at end of file
--
cgit
From 962dd6237d64e201387e38e30ca3b987a80db225 Mon Sep 17 00:00:00 2001
From: Saketh1499
Date: Mon, 6 Sep 2021 11:21:26 +0530
Subject: Adding section to upload syllabus for lab migration proposal
---
download.inc | 22 ++++++++++++
lab_migration.module | 10 ++++++
manage_proposal.inc | 7 ++++
proposal.inc | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++--
settings.inc | 10 ++++++
5 files changed, 143 insertions(+), 3 deletions(-)
diff --git a/download.inc b/download.inc
index d95c5a2..e91eee8 100755
--- a/download.inc
+++ b/download.inc
@@ -281,3 +281,25 @@ function lab_migration_download_lab()
drupal_goto('lab-migration/lab-migration-run');
}
}
+function lab_migration_download_syllabus_copy()
+{
+ $proposal_id = arg(2);
+ $root_path = lab_migration_path();
+ $query = db_select('lab_migration_proposal');
+ $query->fields('lab_migration_proposal');
+ $query->condition('id', $proposal_id);
+ $query->range(0, 1);
+ $result = $query->execute();
+ $syllabus_copy_file_data = $result->fetchObject();
+ $syllabus_copy_file_name = substr($syllabus_copy_file_data->syllabus_copy_file_path, strrpos($syllabus_copy_file_data->syllabus_copy_file_path, '/') + 1);
+ error_reporting(0); //Errors may corrupt download
+ ob_start(); //Insert this
+ header('Content-Description: File Transfer');
+ header('Content-Type: application/octet-stream');
+ header('Content-disposition: attachment; filename="' . $syllabus_copy_file_name . '"');
+ header('Content-Length: ' . filesize($root_path . $syllabus_copy_file_data->syllabus_copy_file_path));
+ ob_clean();
+ ob_end_flush();
+ readfile($root_path . $syllabus_copy_file_data->syllabus_copy_file_path);
+ exit;
+}
\ No newline at end of file
diff --git a/lab_migration.module b/lab_migration.module
index 6a861a1..b888926 100755
--- a/lab_migration.module
+++ b/lab_migration.module
@@ -569,6 +569,16 @@ function lab_migration_menu()
),
'file' => 'pdf/verify_lab_migration_certificates.inc'
);
+ $items['download/syllabus_copy_file'] = array(
+ 'title' => 'Syllabus Copy Download',
+ 'description' => 'Syllabus Copy Download',
+ 'page callback' => 'lab_migration_download_syllabus_copy',
+ 'access arguments' => array(
+ 'lab migration bulk manage code'
+ ),
+ 'type' => MENU_CALLBACK,
+ 'file' => 'download.inc'
+ );
return $items;
}
/**
diff --git a/manage_proposal.inc b/manage_proposal.inc
index b9071ab..cb94a7e 100755
--- a/manage_proposal.inc
+++ b/manage_proposal.inc
@@ -281,6 +281,13 @@ function lab_migration_proposal_approval_form($form, $form_state)
'#markup' => $experiment_list,
'#title' => t('Experiments')
);
+ if ($proposal_data->syllabus_copy_file_path != "None")
+ {
+ $form['syllabus_copy_file_path'] = array(
+ '#type' => 'markup',
+ '#markup' => l('Click here to download uploaded syllabus copy', 'download/syllabus_copy_file/' . $proposal_id) . "
"
+ );
+ } //$row->samplefilepath != "None"
if ($proposal_data->solution_provider_uid == 0)
{
$solution_provider = "User will not provide solution, we will have to provide solution";
diff --git a/proposal.inc b/proposal.inc
index 85175f8..c8d450d 100755
--- a/proposal.inc
+++ b/proposal.inc
@@ -279,6 +279,22 @@ function lab_migration_proposal_form($form, &$form_state)
)
)
);
+
+ $form['syllabus_copy'] = array(
+ '#type' => 'fieldset',
+ '#title' => t('Syllabus copy (PDF) Files *'),
+ '#collapsible' => FALSE,
+ '#collapsed' => FALSE
+ );
+ $form['syllabus_copy']['syllabus_copy_file'] = array(
+ '#type' => 'file',
+ '#title' => t('Upload pdf file'),
+ '#size' => 48,
+ '#description' => t('Separate filenames with underscore. No spaces or any special characters allowed in filename.') .
+ '
' . t('Allowed file extensions : ') .
+ variable_get('lab_migration_syllabus_file_extensions', '') . ''
+ );
+
$form['lab_title'] = array(
'#type' => 'textfield',
'#title' => t('Title of the Lab'),
@@ -445,6 +461,44 @@ function lab_migration_proposal_form_validate($form, &$form_state)
form_set_error('older', t('Please provide valid version'));
}
}
+
+ if (isset($_FILES['files']))
+ {
+ /* check if atleast one source or result file is uploaded */
+ if (!($_FILES['files']['name']['syllabus_copy_file']))
+ form_set_error('syllabus_copy_file', t('Please upload pdf file.'));
+ /* check for valid filename extensions */
+ foreach ($_FILES['files']['name'] as $file_form_name => $file_name)
+ {
+ if ($file_name)
+ {
+ /* checking file type */
+ if (strstr($file_form_name, 'syllabus'))
+ $file_type = 'S';
+ else
+ $file_type = 'U';
+ $allowed_extensions_str = '';
+ switch ($file_type)
+ {
+ case 'S':
+ $allowed_extensions_str = variable_get('lab_migration_syllabus_file_extensions', '');
+ break;
+ } //$file_type
+ $allowed_extensions = explode(',', $allowed_extensions_str);
+ $allowd_file = strtolower($_FILES['files']['name'][$file_form_name]);
+ $allowd_files = explode('.', $allowd_file);
+ $temp_extension = end($allowd_files);
+ if (!in_array($temp_extension, $allowed_extensions))
+ form_set_error($file_form_name, t('Only file with ' . $allowed_extensions_str . ' extensions can be uploaded.'));
+ if ($_FILES['files']['size'][$file_form_name] <= 0)
+ form_set_error($file_form_name, t('File size cannot be zero.'));
+ /* check if valid file name */
+ if (!lab_migration_check_valid_filename($_FILES['files']['name'][$file_form_name]))
+ form_set_error($file_form_name, t('Invalid file name specified. Only alphabets and numbers are allowed as a valid filename.'));
+ } //$file_name
+ } //$_FILES['files']['name'] as $file_form_name => $file_name
+ } //isset($_FILES['files'])
+
return;
}
function lab_migration_proposal_form_submit($form, &$form_state)
@@ -462,6 +516,7 @@ function lab_migration_proposal_form_submit($form, &$form_state)
$solution_provider_contact_ph = '';
$solution_provider_department = '';
$solution_provider_university = '';
+ $syllabus_copy_file_path = '';
if ($form_state['values']['solution_provider_uid'] == "1")
{
$solution_provider_uid = $user->uid;
@@ -492,11 +547,11 @@ function lab_migration_proposal_form_submit($form, &$form_state)
$university = $v['university'];
$directory_name = _lm_dir_name($lab_title, $proposar_name, $university);
$result = "INSERT INTO {lab_migration_proposal}
- (uid, approver_uid, name_title, name, contact_ph, department, university, city, district, pincode, state, country, r_version, lab_title, approval_status, solution_status, solution_provider_uid, solution_display, creation_date, approval_date, solution_date, solution_provider_name_title, solution_provider_name, solution_provider_contact_ph, solution_provider_department, solution_provider_university, directory_name) VALUES
+ (uid, approver_uid, name_title, name, contact_ph, department, university, city, district, pincode, state, country, r_version, lab_title, approval_status, solution_status, solution_provider_uid, solution_display, creation_date, approval_date, solution_date, solution_provider_name_title, solution_provider_name, solution_provider_contact_ph, solution_provider_department, solution_provider_university, directory_name,syllabus_copy_file_path) VALUES
(:uid, :approver_uid, :name_title, :name, :contact_ph, :department, :university, :city, :district, :pincode, :state, :country,
:r_version, :lab_title, :approval_status, :solution_status, :solution_provider_uid, :solution_display, :creation_date,
:approval_date, :solution_date, :solution_provider_name_title, :solution_provider_name,
- :solution_provider_contact_ph, :solution_provider_department, :solution_provider_university, :directory_name)";
+ :solution_provider_contact_ph, :solution_provider_department, :solution_provider_university, :directory_name,:syllabus_copy_file_path)";
$args = array(
":uid" => $user->uid,
":approver_uid" => 0,
@@ -524,11 +579,47 @@ function lab_migration_proposal_form_submit($form, &$form_state)
":solution_provider_contact_ph" => $solution_provider_contact_ph,
":solution_provider_department" => $solution_provider_department,
":solution_provider_university" => $solution_provider_university,
- ":directory_name" => $directory_name
+ ":directory_name" => $directory_name,
+ ":syllabus_copy_file_path" => "",
);
$proposal_id = db_query($result, $args, array(
'return' => Database::RETURN_INSERT_ID
));
+ $root_path = lab_migration_path();
+ $dest_path = $proposal_id . '/';
+ if (!is_dir($root_path . $dest_path))
+ mkdir($root_path . $dest_path);
+ /* uploading files */
+ foreach ($_FILES['files']['name'] as $file_form_name => $file_name)
+ {
+ if ($file_name)
+ {
+ /* checking file type */
+ $file_type = 'S';
+ if (file_exists($root_path . $dest_path . $_FILES['files']['name'][$file_form_name]))
+ {
+ drupal_set_message(t("Error uploading file. File !filename already exists.", array(
+ '!filename' => $_FILES['files']['name'][$file_form_name]
+ )), 'error');
+ return;
+ } //file_exists($root_path . $dest_path . $_FILES['files']['name'][$file_form_name])
+ /* uploading file */
+ if (move_uploaded_file($_FILES['files']['tmp_name'][$file_form_name], $root_path . $dest_path . $_FILES['files']['name'][$file_form_name]))
+ {
+ $query = "UPDATE {lab_migration_proposal} SET syllabus_copy_file_path = :syllabus_copy_file_path WHERE id = :id";
+ $args = array(
+ ":syllabus_copy_file_path" => $dest_path . $_FILES['files']['name'][$file_form_name],
+ ":id" => $proposal_id
+ );
+ $updateresult = db_query($query, $args);
+ drupal_set_message($file_name . ' uploaded successfully.', 'status');
+ } //move_uploaded_file($_FILES['files']['tmp_name'][$file_form_name], $root_path . $dest_path . $_FILES['files']['name'][$file_form_name])
+ else
+ {
+ drupal_set_message('Error uploading file : ' . $dest_path . '/' . $file_name, 'error');
+ }
+ } //$file_name
+ } //$_FILES['files']['name'] as $file_form_name => $file_name
if (!$proposal_id)
{
drupal_set_message(t('Error receiving your proposal. Please try again.'), 'error');
diff --git a/settings.inc b/settings.inc
index 1856a25..aa7945c 100755
--- a/settings.inc
+++ b/settings.inc
@@ -74,6 +74,15 @@ function lab_migration_settings_form($form, $form_state)
'#required' => TRUE,
'#default_value' => variable_get('lab_migration_pdf_extensions', '')
);
+ $form['extensions']['syllabus'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Allowed syllabus file extensions'),
+ '#description' => t('A comma separated list WITHOUT SPACE of xcos file extensions that are permitted to be uploaded on the server'),
+ '#size' => 50,
+ '#maxlength' => 255,
+ '#required' => TRUE,
+ '#default_value' => variable_get('lab_migration_syllabus_file_extensions', '')
+ );
$form['submit'] = array(
'#type' => 'submit',
'#value' => t('Submit')
@@ -94,5 +103,6 @@ function lab_migration_settings_form_submit($form, &$form_state)
variable_set('lab_migration_result_extensions', $form_state['values']['result']);
variable_set('lab_migration_xcos_extensions', $form_state['values']['xcos']);
variable_set('lab_migration_pdf_extensions', $form_state['values']['pdf']);
+ variable_set('lab_migration_syllabus_file_extensions', $form_state['values']['syllabus']);
drupal_set_message(t('Settings updated'), 'status');
}
--
cgit
From fa6d71af6cdb82586226c63700183bd828cecce5 Mon Sep 17 00:00:00 2001
From: Saketh1499
Date: Wed, 8 Sep 2021 15:12:41 +0530
Subject: Updating country fields
---
manage_proposal.inc | 42 ++++++-----------------------
proposal.inc | 78 +++++++++--------------------------------------------
2 files changed, 20 insertions(+), 100 deletions(-)
diff --git a/manage_proposal.inc b/manage_proposal.inc
index cb94a7e..284db02 100755
--- a/manage_proposal.inc
+++ b/manage_proposal.inc
@@ -248,11 +248,6 @@ function lab_migration_proposal_approval_form($form, $form_state)
'#markup' => $proposal_data->city,
'#title' => t('City')
);
- $form['district'] = array(
- '#type' => 'item',
- '#markup' => $proposal_data->district,
- '#title' => t('District')
- );
$form['pincode'] = array(
'#type' => 'item',
'#markup' => $proposal_data->pincode,
@@ -526,11 +521,6 @@ function lab_migration_proposal_status_form($form, $form_state)
'#markup' => $proposal_data->city,
'#title' => t('City')
);
- $form['district'] = array(
- '#type' => 'item',
- '#markup' => $proposal_data->district,
- '#title' => t('District')
- );
$form['pincode'] = array(
'#type' => 'item',
'#markup' => $proposal_data->pincode,
@@ -804,19 +794,19 @@ function lab_migration_proposal_edit_form($form, $form_state)
'India' => 'India',
'Others' => 'Others'
),
+ '#default_value' => $proposal_data->country,
'#required' => TRUE,
'#tree' => TRUE,
- '#validated' => TRUE,
- '#default_value' => $proposal_data->country
+ '#validated' => TRUE
);
$form['other_country'] = array(
'#type' => 'textfield',
'#title' => t('Other than India'),
'#size' => 100,
+ '#default_value' => $proposal_data->country,
'#attributes' => array(
'placeholder' => t('Enter your country name')
),
- '#default_value' => $proposal_data->country,
'#states' => array(
'visible' => array(
':input[name="country"]' => array(
@@ -860,22 +850,9 @@ function lab_migration_proposal_edit_form($form, $form_state)
$form['all_state'] = array(
'#type' => 'select',
'#title' => t('State'),
- '#options' => _lab_migration_list_of_states(),
- '#validated' => TRUE,
+ '#options' => _lm_list_of_states(),
'#default_value' => $proposal_data->state,
- '#states' => array(
- 'visible' => array(
- ':input[name="country"]' => array(
- 'value' => 'India'
- )
- )
- )
- );
- $form['district'] = array(
- '#type' => 'select',
- '#title' => t('District'),
- '#options' => _lab_migration_list_of_district(),
- '#default_value' => $proposal_data->district,
+ '#validated' => TRUE,
'#states' => array(
'visible' => array(
':input[name="country"]' => array(
@@ -887,7 +864,7 @@ function lab_migration_proposal_edit_form($form, $form_state)
$form['city'] = array(
'#type' => 'select',
'#title' => t('City'),
- '#options' => _lab_migration_list_of_cities(),
+ '#options' => _lm_list_of_cities(),
'#default_value' => $proposal_data->city,
'#states' => array(
'visible' => array(
@@ -897,18 +874,16 @@ function lab_migration_proposal_edit_form($form, $form_state)
)
)
);
-
$form['pincode'] = array(
'#type' => 'textfield',
'#title' => t('Pincode'),
'#size' => 30,
'#maxlength' => 6,
'#default_value' => $proposal_data->pincode,
- '#required' => False,
'#attributes' => array(
- 'placeholder' => 'Enter pincode....'
+ 'placeholder' => 'Insert pincode of your city/ village....'
)
- );
+ );
$form['lab_title'] = array(
'#type' => 'textfield',
@@ -1182,7 +1157,6 @@ function lab_migration_proposal_edit_form_submit($form, &$form_state)
'department' => $v['department'],
'university' => $v['university'],
'city' => $v['city'],
- 'district' => $v['district'],
'pincode' => $v['pincode'],
'state' => $v['all_state'],
'lab_title' => $v['lab_title'],
diff --git a/proposal.inc b/proposal.inc
index c8d450d..932e598 100755
--- a/proposal.inc
+++ b/proposal.inc
@@ -117,12 +117,6 @@ function lab_migration_proposal_form($form, &$form_state)
'India' => 'India',
'Others' => 'Others'
),
- //'#default_value' => 'India',
- '#prefix' => '',
- '#suffix' => '
',
- // '#ajax' => array(
- // 'callback' => 'ajax_get_lm_district_list_callback',
- // ),
'#required' => TRUE,
'#tree' => TRUE,
'#validated' => TRUE
@@ -174,17 +168,8 @@ function lab_migration_proposal_form($form, &$form_state)
);
$form['all_state'] = array(
'#type' => 'select',
- '#title' => t('State/UT'),
- '#options' => _lab_migration_list_of_states(),
- //'#empty_value' => '0',
- //'#empty_option' => '- Select -',
- '#default_value' => '0',
- '#prefix' => '',
- '#suffix' => '
',
- '#required' => TRUE,
- '#ajax' => array(
- 'callback' => 'ajax_get_lm_district_list_callback',
- ),
+ '#title' => t('State'),
+ '#options' => _lm_list_of_states(),
'#validated' => TRUE,
'#states' => array(
'visible' => array(
@@ -194,64 +179,26 @@ function lab_migration_proposal_form($form, &$form_state)
)
)
);
- $form['district'] = array(
- '#type' => 'select',
- '#title' => t('District/Area'),
- '#options' => _lab_migration_list_of_district($selected_state),
- //'#empty_value' => '0',
- //'#empty_option' => '- Select -',
- '#prefix' => '',
- '#suffix' => '
',
- '#validated' => TRUE,
- '#required' => TRUE,
- '#ajax' => array(
- 'callback' => 'ajax_get_lm_city_list_callback',
- ),
- '#states' => array(
- 'visible' => array(
- ':input[name="all_state"]' => array(
- 'value' => 'India'
- )
- )
- )
- );
$form['city'] = array(
'#type' => 'select',
- '#title' => t('City/Area'),
- '#options' => _lab_migration_list_of_cities($selected_state, $selected_district),
- //'#empty_value' => '0',
- //'#empty_option' => '- Select -',
- '#prefix' => '',
- '#suffix' => '
',
- '#validated' => TRUE,
- '#required' => TRUE,
- '#ajax' => array(
- 'callback' => 'ajax_get_lm_city_pincode_list_callback',
- ),
+ '#title' => t('City'),
+ '#options' => _lm_list_of_cities(),
'#states' => array(
'visible' => array(
- ':input[name="district"]' => array(
+ ':input[name="country"]' => array(
'value' => 'India'
)
)
)
);
$form['pincode'] = array(
- '#type' => 'select',
+ '#type' => 'textfield',
'#title' => t('Pincode'),
- '#options' => _lab_migration_list_of_city_pincode($selected_city, $selected_state, $selected_district),
- '#prefix' => '',
- '#suffix' => '
',
- //'#empty_value' => '0',
- //'#empty_option' => '- Select -',
+ '#size' => 30,
+ '#maxlength' => 6,
'#required' => TRUE,
- '#validated' => TRUE,
- '#states' => array(
- 'visible' => array(
- ':input[name="city"]' => array(
- 'value' => 'India'
- )
- )
+ '#attributes' => array(
+ 'placeholder' => 'Enter pincode....'
)
);
/***************************************************************************/
@@ -547,8 +494,8 @@ function lab_migration_proposal_form_submit($form, &$form_state)
$university = $v['university'];
$directory_name = _lm_dir_name($lab_title, $proposar_name, $university);
$result = "INSERT INTO {lab_migration_proposal}
- (uid, approver_uid, name_title, name, contact_ph, department, university, city, district, pincode, state, country, r_version, lab_title, approval_status, solution_status, solution_provider_uid, solution_display, creation_date, approval_date, solution_date, solution_provider_name_title, solution_provider_name, solution_provider_contact_ph, solution_provider_department, solution_provider_university, directory_name,syllabus_copy_file_path) VALUES
- (:uid, :approver_uid, :name_title, :name, :contact_ph, :department, :university, :city, :district, :pincode, :state, :country,
+ (uid, approver_uid, name_title, name, contact_ph, department, university, city, pincode, state, country, r_version, lab_title, approval_status, solution_status, solution_provider_uid, solution_display, creation_date, approval_date, solution_date, solution_provider_name_title, solution_provider_name, solution_provider_contact_ph, solution_provider_department, solution_provider_university, directory_name,syllabus_copy_file_path) VALUES
+ (:uid, :approver_uid, :name_title, :name, :contact_ph, :department, :university, :city, :pincode, :state, :country,
:r_version, :lab_title, :approval_status, :solution_status, :solution_provider_uid, :solution_display, :creation_date,
:approval_date, :solution_date, :solution_provider_name_title, :solution_provider_name,
:solution_provider_contact_ph, :solution_provider_department, :solution_provider_university, :directory_name,:syllabus_copy_file_path)";
@@ -561,7 +508,6 @@ function lab_migration_proposal_form_submit($form, &$form_state)
":department" => $v['department'],
":university" => $v['university'],
":city" => $v['city'],
- ":district" => $v['district'],
":pincode" => $v['pincode'],
":state" => $v['all_state'],
":country" => $v['country'],
--
cgit
From 5d34b8eda7e2766baacc654eb1e10f439cb69112 Mon Sep 17 00:00:00 2001
From: Saketh1499
Date: Wed, 8 Sep 2021 16:55:27 +0530
Subject: Updating download url for syllabus for lab migration proposal
---
download.inc | 2 +-
lab_migration.module | 2 +-
manage_proposal.inc | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/download.inc b/download.inc
index e91eee8..04fd147 100755
--- a/download.inc
+++ b/download.inc
@@ -283,7 +283,7 @@ function lab_migration_download_lab()
}
function lab_migration_download_syllabus_copy()
{
- $proposal_id = arg(2);
+ $proposal_id = (int)arg(3);
$root_path = lab_migration_path();
$query = db_select('lab_migration_proposal');
$query->fields('lab_migration_proposal');
diff --git a/lab_migration.module b/lab_migration.module
index b888926..b919211 100755
--- a/lab_migration.module
+++ b/lab_migration.module
@@ -569,7 +569,7 @@ function lab_migration_menu()
),
'file' => 'pdf/verify_lab_migration_certificates.inc'
);
- $items['download/syllabus_copy_file'] = array(
+ $items['lab-migration/download/syllabus-copy-file'] = array(
'title' => 'Syllabus Copy Download',
'description' => 'Syllabus Copy Download',
'page callback' => 'lab_migration_download_syllabus_copy',
diff --git a/manage_proposal.inc b/manage_proposal.inc
index 284db02..6e037ae 100755
--- a/manage_proposal.inc
+++ b/manage_proposal.inc
@@ -280,7 +280,7 @@ function lab_migration_proposal_approval_form($form, $form_state)
{
$form['syllabus_copy_file_path'] = array(
'#type' => 'markup',
- '#markup' => l('Click here to download uploaded syllabus copy', 'download/syllabus_copy_file/' . $proposal_id) . "
"
+ '#markup' => l('Click here to download uploaded syllabus copy', 'lab-migration/download/syllabus-copy-file/' . $proposal_id) . "
"
);
} //$row->samplefilepath != "None"
if ($proposal_data->solution_provider_uid == 0)
--
cgit