Skip to content

Commit

Permalink
Styling (#10)
Browse files Browse the repository at this point in the history 
* Develop: add new theme and plugins (#3)

* remove unnecessary lines on print letter

* sync from mobile branch (rosariosis) (#2)

* Fix SQL error invalid input syntax for integer

* Place currency symbol after amount for some locales

* SQL use timestamp type: standard & without time zone by default

* Fix typo in the Custom module README.md file

* CSS add .accounting-totals, .accounting-staff-payroll-totals, .student-billing-totals classes

* Add Balance widget to Print Statements

* Add Staff Payroll Balance widget to Print Statements

* Add Total calculation to Daily Transactions

* Fix $school_id & get back unescaped value

Co-authored-by: François Jacquet <[email protected]>

* add legacy theme

* change search form

* change input tag

* config database

* input styling

Co-authored-by: François Jacquet <[email protected]>

* update fork 24-08-2022 (#4)

* SQL convert address table name to lowercase

* SQL shorten year month extract

Co-authored-by: François Jacquet <[email protected]>

* new module

* form input styling

* prepare rebase

* ignoring .idea/

---------

Co-authored-by: François Jacquet <[email protected]>
  • Loading branch information
@fu4d @francoisjacquet
fu4d and francoisjacquet authored Sep 6, 2023
1 parent 55b6b01 commit bae7b03
Show file tree
Hide file tree
Showing 11 changed files with 67 additions and 126 deletions.
8 changes: 0 additions & 8 deletions .idea/.gitignore
View file

This file was deleted.

56 changes: 0 additions & 56 deletions .idea/codeStyles/Project.xml
View file

This file was deleted.

5 changes: 0 additions & 5 deletions .idea/codeStyles/codeStyleConfig.xml
View file

This file was deleted.

8 changes: 0 additions & 8 deletions .idea/modules.xml
View file

This file was deleted.

9 changes: 0 additions & 9 deletions .idea/php.xml
View file

This file was deleted.

12 changes: 0 additions & 12 deletions .idea/sms.iml
View file

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/vcs.xml
View file

This file was deleted.

8 changes: 7 additions & 1 deletion database.inc.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
48 changes: 40 additions & 8 deletions functions/Inputs.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 type="date"class="field-value input-date" id="'.$input_name.'" name="'.$input_name.'" value="'.$value.'">';
$input_date .= '<label for="' . $input_name . '">' .
_( $ftitle ) . '</label>';
return InputDivOnclick(
$id,
$input_date,
( $value != '' ? ProperDate( $value ) : '-' ),
FormatInputTitle( $title )
);
return $input_date;

if ( ! AllowEdit()
|| isset( $_REQUEST['_ROSARIO_PDF'] ) )
{
Expand Down Expand Up @@ -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 = '<input class="input"' . $type . ' id="' . $id . '" name="' . AttrEscape( $name ) .
'" value="' . AttrEscape( $value ) . '" ' . $extra . ' placeholder="'.$title.'" />' .
FormatInputTitle( $title, $id, $required );
=======
$input = '<input ' . $type . ' id="' . $id . '" name="' . AttrEscape( $name ) .
'" value="' . AttrEscape( $value ) . '" ' . $extra . '>' .
FormatInputTitle( $title, $id, $required );
>>>>>>> develop

if ( is_null( $value )
|| trim( $value ) == ''
Expand Down Expand Up @@ -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' );

Expand Down Expand Up @@ -911,27 +930,33 @@ function SelectInput( $values, $name, $title = '', $options = [], $allow_na = 'N

return $display_val . FormatInputTitle( $title );
}
$selectedValue = '';
foreach ( (array) $values as $value )
{
$selectedValue = $value;
}

$select = '<select name="' . AttrEscape( $name ) . '" id="' . $id . '" ' . $extra . '>';
$select = '<select name="' . AttrEscape( $name ) . '" id="' . $id . '" ' . $extra . ' class="select" onchange=" this.dataset.chosen = this.value;" data-chosen="'.$selectedValue.'">';

if ( $allow_na !== false )
{
$select .= '<option value="">' . ( $allow_na === 'N/A' ? _( 'N/A' ) : $allow_na ) . '</option>';
$select .= '<option value="">' . ( $allow_na === 'N/A' ? '' : $allow_na ) . '</option>';
}

$make_option = function( $values, $key, $val )
{
$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;
}
Expand Down Expand Up @@ -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 );
Expand Down Expand Up @@ -1882,18 +1907,25 @@ function InputDivOnclick( $id, $input_html, $value, $input_ftitle )

$script = '<script>var html' . $id_var_name_sanitized . '=' . json_encode( $input_html ).';</script>';

$value = $value == '' ? '-' : $value;
$value = strpos($id,'new') ? '<span class="field-value input-date">-</span>' : '<span class="underline-dots">'.$value.'</span>';

$onfocus_js = 'addHTML(html' . $id_var_name_sanitized . ',"div' . $id_var_name_sanitized . '",true);
$("#' . $id_var_name_sanitized . '").focus();
$("#div' . $id_var_name_sanitized . '").click();';

$div_onclick = '<div id="div' . $id_var_name_sanitized . '">
<div class="onclick" tabindex="0" onfocus="' . AttrEscape( $onfocus_js ) . '">' .
<<<<<<< HEAD
( mb_strpos( $value, '<div' ) === 0 ?
'<div class="underline-dots">' . $value . '</div>' :
$value ) .
$input_ftitle . '</div></div>';
=======
( mb_strpos( $value, '<div' ) === 0 ?
'<div class="underline-dots">' . $value . '</div>' :
'<span class="underline-dots">' . $value . '</span>' ) .
$input_ftitle . '</div></div>';
>>>>>>> develop

return $script . $div_onclick;
}
Expand Down
4 changes: 2 additions & 2 deletions modules/Students/Search.inc.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
[]
);

echo '</table><div class="center">';
echo '</table><div class="footer-form">';

if ( ! empty( $extra['search_second_col'] ) )
{
Expand Down Expand Up @@ -89,7 +89,7 @@
echo '<label><input type="checkbox" name="include_inactive" value="Y">&nbsp;' .
_( 'Include Inactive Students' ) . '</label><br />';

echo '<br />' . Buttons( _( 'Submit' ) ) . '</div><br />';
echo '<div class="btn_action">' . Buttons( _( 'Submit' ) ) . '</div>';

if ( ! empty( $extra['search'] )
|| ! empty( $extra['extra_search'] )
Expand Down
29 changes: 18 additions & 11 deletions modules/Students/includes/SaveEnrollment.fnc.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@
function SaveEnrollment()
{
global $error, $student_id;
/*echo 'POST <br>';
var_dump($_POST);
echo '****************************************** <br>';
echo 'REQUEST <br>';
var_dump($_REQUEST);
echo '++++++++++++++++++++++++++++++++++++++ <br>';*/

if ( ! empty( $_POST['month_values']['student_enrollment'] )
|| ! empty( $_POST['values']['student_enrollment'] ) )
Expand All @@ -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'] )
Expand All @@ -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;

Expand All @@ -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 )
{
Expand All @@ -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'];

Expand All @@ -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 )
{
Expand Down

0 comments on commit bae7b03

Please sign in to comment.