Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
rhalp10 committed Apr 28, 2019
1 parent f86fa74 commit 34db4b2
Show file tree
Hide file tree
Showing 25 changed files with 659 additions and 446 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 17 additions & 0 deletions assets/uploads/greenannex sql.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
CREATE VIEW [Current Product List] AS
SELECT ProductID, ProductName
FROM Products
WHERE Discontinued = No;

-------------

CREATE VIEW [List of Account]
CREATE VIEW [List of Student]
CREATE VIEW [List of Teacher]
CREATE VIEW [List of Parent]
CREATE VIEW [List of Attendance]
CREATE VIEW [List of Subject Per Section]
CREATE VIEW [Parent View Child Record]
CREATE VIEW [List of Attendance Per Section]
CREATE VIEW [Full Student Details]
CREATE VIEW [List of Grade Per Student]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
130 changes: 130 additions & 0 deletions dashboard/admission-file.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
<?php
include('../dbconfig.php');
$admission_ID = $_REQUEST['admission_ID'];

$sql = "SELECT * FROM `admission_files` af
LEFT JOIN ref_requirements rr ON af.req_ID = rr.req_ID
WHERE af.admission_ID = $admission_ID
";
$result = mysqli_query($con, $sql);
$file_Name = array();
$req_ID = "";
while($row = mysqli_fetch_array($result))
{
$req_ID = $row["req_ID"];
$file_Name[$req_ID] = $row["file_Name"];
}


function check_file($file_Name){
if (!empty($file_Name)) {

echo ' class="btn btn-success" href="../assets/uploads/'.$file_Name.'" download';
}
else{
echo ' class="btn btn-danger" href="#" download disabled=""';
}
}
?>
<div class="row">
<div class="col-lg-5 col-lg-offset-4 col-sm-6 col-sm-offset-3">

<div class="row">
<div class="col-sm-12">
<div class="form-group">
<a <?php

if (isset($file_Name[1])) {
check_file($file_Name[1]);
}
else{
check_file('');
}


?>><i class="icon-download" ></i></a>
<label for="rcard">Report Card</label>

</div>
<div class="form-group">
<a <?php

if (isset($file_Name[2])) {
check_file($file_Name[2]);
}
else{
check_file('');
}


?>><i class="icon-download" ></i></a>
<label for="bcert">Photocopy of Birth Certificate</label>

</div>

<div class="form-group">
<a <?php

if (isset($file_Name[3])) {
check_file($file_Name[3]);
}
else{
check_file('');
}


?>><i class="icon-download" ></i></a>
<label for="pic1x1">1x1 ID Picture</label>

</div>

<div class="form-group">
<a <?php

if (isset($file_Name[4])) {
check_file($file_Name[4]);
}
else{
check_file('');
}


?>><i class="icon-download" ></i></a>
<label for="gmoralcert">Good Moral Certificate</label>

</div>

<div class="form-group">
<a <?php

if (isset($file_Name[5])) {
check_file($file_Name[5]);
}
else{
check_file('');
}


?>><i class="icon-download" ></i></a>
<label for="brgyclrnc">Barangay Clearance</label>

</div>
<div class="form-group">
<a <?php

if (isset($file_Name[6])) {
check_file($file_Name[6]);
}
else{
check_file('');
}


?>><i class="icon-download" ></i></a>
<label for="financial">Financial Assessment (from private school)</label>

</div>
</div>
</div>
</div>
</div>
11 changes: 9 additions & 2 deletions dashboard/dash-content-admission.php
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@
<ul class="nav nav-tabs">
<li class="active"><a data-toggle="tab" href="#view_a">A.Registration</a></li>
<li><a data-toggle="tab" href="#view_b">B. BIOMETRIC DATA (CLINIC/ NURSE)</a></li>
<li><a data-toggle="tab" href="#view_C">C. REQUIREMENT FILES</a></li>
</ul>
<div class="tab-content">
Expand Down Expand Up @@ -301,6 +302,10 @@
</div>
</div>
</div>
<div id="view_C" class="tab-pane fade in ">
</div>
</div>
Expand Down Expand Up @@ -441,7 +446,7 @@ function numberInputOnly(elem) {
});
$(document).on('click', '.view', function () {
var adconfirm_ID = $(this).attr("id");
$( "#view_C" ).load( "admission-file.php?admission_ID="+adconfirm_ID );
$('#confx').hide();
$('.modal-title').text("VIEW ADMISSION");
$.ajax({
Expand Down Expand Up @@ -492,7 +497,9 @@ function numberInputOnly(elem) {
$(document).on('click', '.confirm', function () {
var adconfirm_ID = $(this).attr("id");
$( "#view_C" ).load( "admission-file.php?admission_ID="+adconfirm_ID );
$.ajax({
url: "datatable/admission/fetch_single_confirm.php",
type: "POST",
Expand Down
2 changes: 1 addition & 1 deletion dashboard/dash-content-attendance.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
?>
<tr>
<td class="text-center" style="width: 10%;"><?php echo $i?></td>
<td style="width: 70%;">RHALP DARREN CABRERA</td>
<td style="width: 70%;"></td>
<td class="text-center" style="width: 20%;"> <div class="btn-group"><button class="btn btn-danger"><i class="icon-user-cancel"></i></button><button class="btn btn-success"><i class="icon-user-check"></i></button></div></td>
</tr>
<?PHP
Expand Down
24 changes: 23 additions & 1 deletion dashboard/dash-content-teacher_assign.php
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,20 @@
<div class="col-sm-1">
<label>&nbsp; </label>
<input type="button" class="form-control btn btn-primary btn-sm" value="LOAD" id="load_atn_in_spc_date">

</div>
<div class="col-sm-3">
</div>
<div class="col-sm-3">
<label>Filter</label>
<select class="form-control" id="filter_attendance_print">
<option>Day</option>
<option>Month</option>
<option>Yearly</option>
</select>
</div>
<div class="col-sm-1">
<label>&nbsp; </label>
<input type="button" class="form-control btn btn-primary btn-sm" value="PRINT" id="print_atn_in_spc_date">
</div>
</div>
</div>
Expand Down Expand Up @@ -946,6 +959,15 @@ function load_attendancedata(tsa_ID)
alert(load_spec_date);
});

$(document).on('click', '#print_atn_in_spc_date', function(){
var load_spec_date = $('#load_spec_date').val();
var filter_attendance_print = $('#filter_attendance_print').val();

alert(load_spec_date + filter_attendance_print);
});



$(document).on('submit', '#sub_attendance_form', function (event) {
event.preventDefault();
$.ajax({
Expand Down
8 changes: 4 additions & 4 deletions dashboard/dash-content.php
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ function build_calendar($month,$year) {
?>
<div class="row">
<div class="col-lg-3">
<div class="panel panel-default">
<div class="panel panel-success">
<div class="panel-heading">
Student
</div>
Expand All @@ -122,7 +122,7 @@ function build_calendar($month,$year) {

</div>
<div class="col-lg-3">
<div class="panel panel-default">
<div class="panel panel-primary">
<div class="panel-heading">
Teacher
</div>
Expand All @@ -133,7 +133,7 @@ function build_calendar($month,$year) {
</div>

<div class="col-lg-3">
<div class="panel panel-default">
<div class="panel panel-warning">
<div class="panel-heading">
Parent
</div>
Expand All @@ -144,7 +144,7 @@ function build_calendar($month,$year) {
</div>

<div class="col-lg-3">
<div class="panel panel-default">
<div class="panel panel-danger">
<div class="panel-heading">
News
</div>
Expand Down
7 changes: 5 additions & 2 deletions dashboard/datatable/admission/fetch.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,12 @@
{

if ($row["admission_Status"] == 1) {
$stat = '<span class="label label-success">Accepted</span>';
$stat = '<span class="label label-primary">Pending Requirements</span>';
}
else if ($row["admission_Status"] == 2) {
$stat = '<span class="label label-success">Requirements Complete</span>';
} else {
$stat = '<span class="label label-warning">Pending</span>';
$stat = '<span class="label label-danger">Pending Confirmation</span>';
}


Expand Down
3 changes: 2 additions & 1 deletion dashboard/datatable/admission/insert.php
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,8 @@
<li> Brown Envelope (Long)</li>
<li> Financial Assessment (from private school)</li>
</ul>
<a href='http://localhost/GreenAnnex%20Monitoring/index?page=admission-files&admission_ID=$adconfirm_ID'>UPLOAD SCAN DOCUMENT HERE</a>
</body>
</html>
";
Expand Down
2 changes: 1 addition & 1 deletion dashboard/datatable/teacher-filter-sub/fetch_student.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
$sub_array[] = $row['rsd_FName'].' '.$row['rsd_MName'].' '.$row['rsd_LName'];
$sub_array[] = $row['sex_Name'];
if ($user_level == 4) {
$sub_array[] = '<div class="dropdown"><button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">Action<span class="caret"></span></button><ul class="dropdown-menu"><li><a href="#" id="'.$row["recs_ID"].'" class="studAttendance">Attendance</a></li><li><a href="#" id="'.$row["recs_ID"].'" class="studGrade">Grade</a></li>
$sub_array[] = '<div class="dropdown"><button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">Action<span class="caret"></span></button><ul class="dropdown-menu"><li><a href="#" id="'.$row["recs_ID"].'" class="studGrade">Grade</a></li>
<li><a href="#" id="'.$row["recs_ID"].'" class="studstudLO" id="studstudLO">Learner observed</a></li>
<li><a href="#" id="'.$row["recs_ID"].'" class="print_form138" id="print_form138" >Print Form138</a></li>
</ul></div>';
Expand Down
Loading

0 comments on commit 34db4b2

Please sign in to comment.