diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 13566b81b..000000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Editor-based HTTP Client requests -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index 4c9e052b8..000000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml deleted file mode 100644 index 79ee123c2..000000000 --- a/.idea/codeStyles/codeStyleConfig.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 456b18c39..000000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/php.xml b/.idea/php.xml deleted file mode 100644 index 85d0a1121..000000000 --- a/.idea/php.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/sms.iml b/.idea/sms.iml deleted file mode 100644 index 2c97708e6..000000000 --- a/.idea/sms.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7f4..000000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/database.inc.php b/database.inc.php index b9deee698..b0d62f49d 100644 --- a/database.inc.php +++ b/database.inc.php @@ -152,7 +152,13 @@ function db_query( $sql, $show_error = true ) } else { - $result = pg_exec( $db_connection, $sql ); + try { + $result = pg_exec( $db_connection, $sql ); + } + catch (Exception $exception) { + echo $sql; + } + } if ( $result === false diff --git a/functions/Inputs.php b/functions/Inputs.php index e9bf9e6c2..e847aeaa6 100644 --- a/functions/Inputs.php +++ b/functions/Inputs.php @@ -33,6 +33,19 @@ function DateInput( $value, $name, $title = '', $div = true, $allow_na = true, $ $ftitle = FormatInputTitle( $title, '', $value == '' && $required ); +// $input_name = strtolower(explode('[', str_replace(']','',$name))[1]); + $input_name = strtolower($name); + $input_date = ''; + $input_date .= ''; + return InputDivOnclick( + $id, + $input_date, + ( $value != '' ? ProperDate( $value ) : '-' ), + FormatInputTitle( $title ) + ); + return $input_date; + if ( ! AllowEdit() || isset( $_REQUEST['_ROSARIO_PDF'] ) ) { @@ -112,9 +125,15 @@ function TextInput( $value, $name, $title = '', $extra = '', $div = true ) // Specify input type via $extra (email,...). $type = mb_strpos( $extra, 'type=' ) === false ? 'type="text"' : ''; +<<<<<<< HEAD + $input = '' . + FormatInputTitle( $title, $id, $required ); +======= $input = '' . FormatInputTitle( $title, $id, $required ); +>>>>>>> develop if ( is_null( $value ) || trim( $value ) == '' @@ -191,8 +210,8 @@ function PasswordInput( $value, $name, $title = '', $extra = '', $div = true ) $extra .= ' type="password" autocomplete="new-password"'; - $input = TextInput( ( $value !== str_repeat( '*', 8 ) ? $value : '' ), $name, '', $extra, false ); - + $input = TextInput( ( $value !== str_repeat( '*', 8 ) ? $value : '' ), $name, $title, $extra, false ); + $input .= FormatInputTitle( $title, $id, $required ); $lock_icons = button( 'unlocked', '', '', 'password-toggle password-show' ) . button( 'locked', '', '', 'password-toggle password-hide' ); @@ -911,12 +930,17 @@ function SelectInput( $values, $name, $title = '', $options = [], $allow_na = 'N return $display_val . FormatInputTitle( $title ); } + $selectedValue = ''; + foreach ( (array) $values as $value ) + { + $selectedValue = $value; + } - $select = ''; if ( $allow_na !== false ) { - $select .= ''; + $select .= ''; } $make_option = function( $values, $key, $val ) @@ -924,14 +948,15 @@ function SelectInput( $values, $name, $title = '', $options = [], $allow_na = 'N $selected = ''; $key .= ''; - + // No need to set first as default foreach ( (array) $values as $value ) { if ( $value == $key && ( !( $value == false && $value !== $key ) || ( $value === '0' && $key === 0 ) ) ) { - $selected = ' selected'; + + $selected = ' selected '; break; } @@ -1040,7 +1065,7 @@ function MLSelectInput( $value, $name, $title, $options, $allow_na = 'N/A', $ext if ( count( $RosarioLocales ) < 2 ) { - return SelectInput( ParseMLField( $value, $locale ), $name, $title, $options, $div ); + return SelectInput( ParseMLField( $value, $locale ), $name, '', $options, $div ); } $id = GetInputID( $name ); @@ -1882,7 +1907,7 @@ function InputDivOnclick( $id, $input_html, $value, $input_ftitle ) $script = ''; - $value = $value == '' ? '-' : $value; + $value = strpos($id,'new') ? '-' : ''.$value.''; $onfocus_js = 'addHTML(html' . $id_var_name_sanitized . ',"div' . $id_var_name_sanitized . '",true); $("#' . $id_var_name_sanitized . '").focus(); @@ -1890,10 +1915,17 @@ function InputDivOnclick( $id, $input_html, $value, $input_ftitle ) $div_onclick = '
' . +<<<<<<< HEAD + ( mb_strpos( $value, '' . $value . '
' : + $value ) . + $input_ftitle . '
'; +======= ( mb_strpos( $value, '' . $value . '' : '' . $value . '' ) . $input_ftitle . ''; +>>>>>>> develop return $script . $div_onclick; } diff --git a/modules/Students/Search.inc.php b/modules/Students/Search.inc.php index 612b29979..6a867e9a7 100644 --- a/modules/Students/Search.inc.php +++ b/modules/Students/Search.inc.php @@ -60,7 +60,7 @@ [] ); - echo '
'; + echo '
'; if ( ! empty( $extra['search_second_col'] ) ) { @@ -89,7 +89,7 @@ echo '
'; - echo '
' . Buttons( _( 'Submit' ) ) . '

'; + echo '
' . Buttons( _( 'Submit' ) ) . '
'; if ( ! empty( $extra['search'] ) || ! empty( $extra['extra_search'] ) diff --git a/modules/Students/includes/SaveEnrollment.fnc.php b/modules/Students/includes/SaveEnrollment.fnc.php index 33cdde083..019f2338c 100644 --- a/modules/Students/includes/SaveEnrollment.fnc.php +++ b/modules/Students/includes/SaveEnrollment.fnc.php @@ -7,6 +7,12 @@ function SaveEnrollment() { global $error, $student_id; + /*echo 'POST
'; + var_dump($_POST); + echo '******************************************
'; + echo 'REQUEST
'; + var_dump($_REQUEST); + echo '++++++++++++++++++++++++++++++++++++++
';*/ if ( ! empty( $_POST['month_values']['student_enrollment'] ) || ! empty( $_POST['values']['student_enrollment'] ) ) @@ -18,9 +24,9 @@ function SaveEnrollment() if ( $stu_enrol_id == 'new' && ! $stu_enrol_month['START_DATE'] ) { unset( $_REQUEST['values']['student_enrollment'][$stu_enrol_id] ); - unset( $_REQUEST['day_values']['student_enrollment'][$stu_enrol_id] ); - unset( $_REQUEST['month_values']['student_enrollment'][$stu_enrol_id] ); - unset( $_REQUEST['year_values']['student_enrollment'][$stu_enrol_id] ); +// unset( $_REQUEST['day_values']['student_enrollment'][$stu_enrol_id] ); +// unset( $_REQUEST['month_values']['student_enrollment'][$stu_enrol_id] ); +// unset( $_REQUEST['year_values']['student_enrollment'][$stu_enrol_id] ); } elseif ( $stu_enrol_id == 'new' && $_REQUEST['values']['student_enrollment']['new']['SCHOOL_ID'] ) @@ -30,12 +36,13 @@ function SaveEnrollment() if ( $enrollment_school_id != UserSchool() ) { // @since 5.4 Update current school to enrollment school. + // FUAD RECHECK $_SESSION['UserSchool'] = DBGetOne( "SELECT ID FROM schools WHERE SYEAR='" . UserSyear() . "' AND ID='" . (int) $enrollment_school_id . "'" ); } - if ( ! empty( $stu_enrol_month['START_DATE'] ) ) + if ( ! empty( $stu_enrol_data['START_DATE'] ) ) { $found_RET = 1; @@ -54,9 +61,9 @@ function SaveEnrollment() if ( $found_RET ) { unset( $_REQUEST['values']['student_enrollment'][$stu_enrol_id] ); - unset( $_REQUEST['day_values']['student_enrollment'][$stu_enrol_id] ); - unset( $_REQUEST['month_values']['student_enrollment'][$stu_enrol_id] ); - unset( $_REQUEST['year_values']['student_enrollment'][$stu_enrol_id] ); +// unset( $_REQUEST['day_values']['student_enrollment'][$stu_enrol_id] ); +// unset( $_REQUEST['month_values']['student_enrollment'][$stu_enrol_id] ); +// unset( $_REQUEST['year_values']['student_enrollment'][$stu_enrol_id] ); if ( $date ) { @@ -65,7 +72,7 @@ function SaveEnrollment() } } } - elseif ( UserStudentID() && ! empty( $stu_enrol_month['START_DATE'] ) ) + elseif ( UserStudentID() && ! empty( $stu_enrol_data['START_DATE'] ) ) { $date = $_REQUEST['values']['student_enrollment'][$stu_enrol_id]['START_DATE']; @@ -84,9 +91,9 @@ function SaveEnrollment() if ( $found_RET ) { unset( $_REQUEST['values']['student_enrollment'][$stu_enrol_id] ); - unset( $_REQUEST['day_values']['student_enrollment'][$stu_enrol_id] ); - unset( $_REQUEST['month_values']['student_enrollment'][$stu_enrol_id] ); - unset( $_REQUEST['year_values']['student_enrollment'][$stu_enrol_id] ); +// unset( $_REQUEST['day_values']['student_enrollment'][$stu_enrol_id] ); +// unset( $_REQUEST['month_values']['student_enrollment'][$stu_enrol_id] ); +// unset( $_REQUEST['year_values']['student_enrollment'][$stu_enrol_id] ); if ( $date ) {