Skip to content

Commit

Permalink
Ver 7.5 release commit
Browse files Browse the repository at this point in the history 
This is the final commit for ver 7.5 release
  • Loading branch information
@openSISAdmin
openSISAdmin committed Sep 3, 2020
1 parent 7fb1793 commit 0c50377
Show file tree
Hide file tree
Showing 23 changed files with 4,460 additions and 4,850 deletions.
4 changes: 2 additions & 2 deletions CoursePeriodModal.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
$id = $cpv_id;
}
//PopTableforWindow('header', $title);
echo "<FORM class=form-horizontal name=popform id=popform action=ForWindow.php?modname=schoolsetup/Courses.php&meet_date=$meet_date&modfunc=detail&mode=$_REQUEST['mode']&subject_id=$subject_id&course_id=$course_id&course_period_id=$cp_id&calendar_id=$calendar_id METHOD=POST>";
echo "<FORM class=form-horizontal name=popform id=popform action=ForWindow.php?modname=schoolsetup/Courses.php&meet_date=" . $meet_date . "&modfunc=detail&mode=" . $_REQUEST['mode'] . "&subject_id=" . $subject_id . "&course_id=" . $course_id . "&course_period_id=" . $cp_id . "&calendar_id=" . $calendar_id . " METHOD=POST>";
echo '<div class="panel">';
echo '<div class="tabbable">';
echo '<ul class="nav nav-tabs nav-tabs-bottom no-margin-bottom"><li class="active"><a href="javascript:void(0);">Add Class</a></li></ul>';
Expand All @@ -66,7 +66,7 @@
unset($cpblocked_RET);
if ($id != '')
echo "<input type=hidden name=cpv_id value='$id' />";
echo '<div class="form-group"><label class="control-label text-right col-lg-4">Date</label><div class="col-lg-8">' . ProperDate($meet_date) . '</div></div>';
echo '<div class="form-group"><label class="control-label text-right col-lg-4">Date</label><div class="col-lg-8 m-t-10">' . ProperDate($meet_date) . '</div></div>';
echo '<div class="form-group"><label class="control-label text-right col-lg-4">Period</label><div class="col-lg-8">' . SelectInputModal($cpblocked_RET['PERIOD_ID'], 'values[PERIOD_ID]', '', $periods, 'N/A', 'id=' . $date . '_period class=form-control onchange="formcheck_periods_F2(' . $date . ');"') . '</div></div>';
echo '<input type="hidden" id="hidden_period_block" value="' . $cpblocked_RET['PERIOD_ID'] . '" />';
echo '<div class="form-group"><label class="control-label text-right col-lg-4">Room</label><div class="col-lg-8">' . SelectInputModal($cpblocked_RET['ROOM_ID'], 'values[ROOM_ID]', '', $rooms, 'N/A', 'id=' . $date . '_room ') . '</div></div>';
Expand Down
4 changes: 2 additions & 2 deletions TransferredOutModal.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,8 @@
unset($_REQUEST['button']);
unset($_SESSION['_REQUEST_vars']['button']);
} else {
echo '<div align=center>There is only one school in the system so student cannot be transfered to any other school<br /><br>
<input type=button class="btn btn-default" value=Close onclick=\'window.close();\'></div>
echo '<div align=center class="m-15">There is only one school in the system so student cannot be transfered to any other school<br /><br>
<input type=button class="btn btn-default" value=Close onclick=\'closeThisModal("modal_default_transferred_out");\'></div>
</form>';
// PopTableWindow('footer');

Expand Down
8 changes: 8 additions & 0 deletions assets/css/custom.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +380,14 @@ ul[id*="select2-period-"] {
}
/* Schoolwide Schedule Reports - End */

.btn-undo {
background-color: #fff;
padding: 6px 8px;
border: 1px solid;
border-radius: 3px;
border-color: inherit;
}


@media (max-width: 768px) {
#navbar-mobile .form-group, #navbar-mobile form {
Expand Down
84 changes: 41 additions & 43 deletions functions/DbDateFnc.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,57 +25,55 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
#***************************************************************************************
function DBDate($type='oracle')
function DBDate($type = 'oracle')
{
if($type=='oracle')
return strtoupper(date('d-M-y'));
elseif($type=='postgres')
return date('Y-m-d');
elseif($type=="mysql")
return date('Y-m-d');
if ($type == 'oracle')
return strtoupper(date('d-M-y'));
elseif ($type == 'postgres')
return date('Y-m-d');
elseif ($type == "mysql")
return date('Y-m-d');
}
function DaySname($value,$pattern='1')
function DaySname($value, $pattern = '1')
{
$days=array('Monday'=>'M','Tuesday'=>'T','Wednesday'=>'W','Thursday'=>'H','Friday'=>'F','Saturday'=>'S','Sunday'=>'U');
if($pattern==1)
return $days[$value];
$days = array('Monday' => 'M', 'Tuesday' => 'T', 'Wednesday' => 'W', 'Thursday' => 'H', 'Friday' => 'F', 'Saturday' => 'S', 'Sunday' => 'U');
if ($pattern == 1)
return $days[$value];
else
return array_search($value,$days);
return array_search($value, $days);
}
function DaySnameMod($value,$pattern='1')
function DaySnameMod($value, $pattern = '1')
{
$days=array('Monday'=>'M','Tuesday'=>'T','Wednesday'=>'W','Thursday'=>'H','Friday'=>'F','Saturday'=>'S','Sunday'=>'U');
if(in_array($value,$days))
{
if($pattern==1)
return $days[$value];
else
return array_search($value,$days);
}
else
{
$val_arr=str_split($value);
$key="";
foreach($val_arr as $val)
{
$key.=array_search($val,$days);
}
//$key_arr=str_split($key);
return $key;
$days = array('Monday' => 'M', 'Tuesday' => 'T', 'Wednesday' => 'W', 'Thursday' => 'H', 'Friday' => 'F', 'Saturday' => 'S', 'Sunday' => 'U');
if (in_array($value, $days)) {
if ($pattern == 1)
return $days[$value];
else
return array_search($value, $days);
} else {
$val_arr = str_split($value);
$checker = false;
$key = "";
foreach ($val_arr as $val) {
if (array_search($val, $days) != false) {
if ($checker == true) {
$key .= ', ';
}
$key .= (array_search($val, $days));
$checker = true;
}
}
//$key_arr=str_split($key);
return $key;
}
}
function MonthFormatter($value,$pattern='1')
function MonthFormatter($value, $pattern = '1')
{

$days=array('JAN'=>'01','FEB'=>'02','MAR'=>'03','APR'=>'04','MAY'=>'05','JUN'=>'06','JUL'=>'07','AUG'=>'08','SEP'=>'09','OCT'=>'10','NOV'=>'11','DEC'=>'12');
if($pattern==1)
{
return $days[$value];
}
else
{
return array_search($value,$days);

$days = array('JAN' => '01', 'FEB' => '02', 'MAR' => '03', 'APR' => '04', 'MAY' => '05', 'JUN' => '06', 'JUL' => '07', 'AUG' => '08', 'SEP' => '09', 'OCT' => '10', 'NOV' => '11', 'DEC' => '12');
if ($pattern == 1) {
return $days[$value];
} else {
return array_search($value, $days);
}
}

?>
42 changes: 29 additions & 13 deletions functions/GetStaffListFnc.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,22 +125,38 @@ function GetUserStaffList(& $extra)
}

$sql .= $extra['WHERE'].' ';
if ($extra['GROUP'])
$sql .= ' GROUP BY ' . $extra['GROUP'];

if (strpos($_REQUEST['modname'], 'users/TeacherPrograms.php') !== false)
{
$sql .= ' AND s.PROFILE_ID NOT IN(0,1) ';
}

if ($extra['GROUP'])
$sql .= ' GROUP BY ' . $extra['GROUP'];

$sql .= 'ORDER BY FULL_NAME ';
/**************************************for Back to User*************************************************************/
if($_SESSION['staf_search']['sql'] && $_REQUEST['return_session']) {
$sql= $_SESSION['staf_search']['sql'];
}
else
{
if ($_REQUEST['sql_save_session_staf'])
$_SESSION['staf_search']['sql'] = $sql;
}
/***************************************************************************************************/

/**************************************for Back to User*************************************************************/

if($_SESSION['staf_search']['sql'] && $_REQUEST['return_session']) {
$sql= $_SESSION['staf_search']['sql'];
}
else
{
if ($_REQUEST['sql_save_session_staf'])
$_SESSION['staf_search']['sql'] = $sql;

if (strpos($_REQUEST['modname'], 'users/TeacherPrograms.php') !== false)
{
$_SESSION['staf_search_hold'] = $sql;
}
}

/***************************************************************************************************/

if ($extra['functions'])
$functions += $extra['functions'];
//echo $sql;
//echo $sql;
return DBGet(DBQuery($sql),$functions);
break;
}
Expand Down
Loading

0 comments on commit 0c50377

Please sign in to comment.