From 2f53a03fa16621708b94195a858dec80ee717803 Mon Sep 17 00:00:00 2001 From: "SAFRAN\\nmsaf" Date: Sun, 26 Nov 2023 13:04:14 +0530 Subject: [PATCH 01/24] updated --- assets/css/bootstrap.css | 20 +++++++++---------- assets/js/fullcalendar/fullcalendar.print.css | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/assets/css/bootstrap.css b/assets/css/bootstrap.css index a9b84c2..e90b73b 100644 --- a/assets/css/bootstrap.css +++ b/assets/css/bootstrap.css @@ -55,7 +55,7 @@ dfn { } h1 { font-size: 2em; - margin: 0.67em 0; + margin: 0.68em 0; } mark { background: #ff0; @@ -374,19 +374,19 @@ cite { text-align: justify; } .text-muted { - color: #999999; + color: #3f3c3c; } .text-primary { - color: #949494; + color: #565353; } a.text-primary:hover { - color: #7b7b7b; + color: #322f2f; } .text-success { - color: #045702; + color: #098407; } a.text-success:hover { - color: #022501; + color: #0d740a; } .text-info { color: #2c7ea1; @@ -401,7 +401,7 @@ a.text-warning:hover { color: #251f01; } .text-danger { - color: #ac1818; + color: #961919; } a.text-danger:hover { color: #7f1212; @@ -414,10 +414,10 @@ a.bg-primary:hover { background-color: #7b7b7b; } .bg-success { - background-color: #bdedbc; + background-color: #7ae278; } a.bg-success:hover { - background-color: #95e294; + background-color: #88dc87; } .bg-info { background-color: #c5e8f7; @@ -485,7 +485,7 @@ h6 .small, h1, h2, h3 { - margin-top: 17px; + margin-top: 18px; margin-bottom: 8.5px; } h1 small, diff --git a/assets/js/fullcalendar/fullcalendar.print.css b/assets/js/fullcalendar/fullcalendar.print.css index 4360719..6f828ad 100644 --- a/assets/js/fullcalendar/fullcalendar.print.css +++ b/assets/js/fullcalendar/fullcalendar.print.css @@ -15,8 +15,8 @@ -----------------------------------------------------*/ .fc-event { - background: #fff !important; - color: #000 !important; + background: rgb(233, 238, 241) !important; + color: #171717 !important; } /* for vertical events */ From 3c41e40c5926bc0507ab4ad807de0cbac1e85ba7 Mon Sep 17 00:00:00 2001 From: mtmzakir Date: Sun, 26 Nov 2023 23:18:56 +0530 Subject: [PATCH 02/24] Parent Update1 --- application/views/backend/admin/navigation.php | 11 ----------- application/views/backend/parent/class.php | 2 +- application/views/backend/parent/class_routine.php | 2 +- application/views/backend/parent/dashboard.php | 6 +++--- application/views/backend/parent/noticeboard.php | 2 +- application/views/backend/parent/teacher.php | 2 +- 6 files changed, 7 insertions(+), 18 deletions(-) diff --git a/application/views/backend/admin/navigation.php b/application/views/backend/admin/navigation.php index 91070f3..bdfa3cf 100644 --- a/application/views/backend/admin/navigation.php +++ b/application/views/backend/admin/navigation.php @@ -213,17 +213,6 @@ - - - - -
  • - - - - -
    • -
  • +
    diff --git a/application/views/backend/parent/class_routine.php b/application/views/backend/parent/class_routine.php index 8040b20..3ad25ba 100644 --- a/application/views/backend/parent/class_routine.php +++ b/application/views/backend/parent/class_routine.php @@ -8,7 +8,7 @@
    -
    +
    diff --git a/application/views/backend/parent/dashboard.php b/application/views/backend/parent/dashboard.php index d720490..a11196a 100644 --- a/application/views/backend/parent/dashboard.php +++ b/application/views/backend/parent/dashboard.php @@ -1,6 +1,6 @@ -
    +
    -
    +
    @@ -23,7 +23,7 @@
    -
    +
    diff --git a/application/views/backend/parent/noticeboard.php b/application/views/backend/parent/noticeboard.php index 9054b07..4ad030e 100644 --- a/application/views/backend/parent/noticeboard.php +++ b/application/views/backend/parent/noticeboard.php @@ -1,4 +1,4 @@ -
    +
    diff --git a/application/views/backend/parent/teacher.php b/application/views/backend/parent/teacher.php index 68a7ac2..5b23672 100644 --- a/application/views/backend/parent/teacher.php +++ b/application/views/backend/parent/teacher.php @@ -1,5 +1,5 @@ - +
    From e9b192a9d40dba5162b6d6e666ef3b2a93ede896 Mon Sep 17 00:00:00 2001 From: mtmzakir Date: Sun, 26 Nov 2023 23:46:29 +0530 Subject: [PATCH 03/24] Admin Update2 --- .../views/backend/admin/manage_profile.php | 22 +-- application/views/backend/admin/message.php | 63 -------- .../views/backend/admin/message_home.php | 26 ---- .../views/backend/admin/message_new.php | 71 --------- .../views/backend/admin/message_read.php | 44 ------ .../views/backend/admin/modal_edit_notice.php | 24 +--- .../views/backend/admin/noticeboard.php | 21 --- .../views/backend/admin/sms_settings.php | 136 ------------------ 8 files changed, 2 insertions(+), 405 deletions(-) delete mode 100644 application/views/backend/admin/message.php delete mode 100644 application/views/backend/admin/message_home.php delete mode 100644 application/views/backend/admin/message_new.php delete mode 100644 application/views/backend/admin/message_read.php delete mode 100644 application/views/backend/admin/sms_settings.php diff --git a/application/views/backend/admin/manage_profile.php b/application/views/backend/admin/manage_profile.php index 5c19c7a..5a7475e 100644 --- a/application/views/backend/admin/manage_profile.php +++ b/application/views/backend/admin/manage_profile.php @@ -35,27 +35,7 @@ -
    - - -
    -
    -
    - ... -
    -
    -
    - - Select image - Change - - - Remove -
    -
    -
    -
    - +
    diff --git a/application/views/backend/admin/message.php b/application/views/backend/admin/message.php deleted file mode 100644 index 17d534f..0000000 --- a/application/views/backend/admin/message.php +++ /dev/null @@ -1,63 +0,0 @@ -
    -
    - - -
    - - - -
    - - -
    - - - - - -
      - - session->userdata('login_type') . '-' . $this->session->userdata('login_user_id'); - - $this->db->where('sender', $current_user); - $this->db->or_where('reciever', $current_user); - $message_threads = $this->db->get('message_thread')->result_array(); - foreach ($message_threads as $row): - - // defining the user to show - if ($row['sender'] == $current_user) - $user_to_show = explode('-', $row['reciever']); - if ($row['reciever'] == $current_user) - $user_to_show = explode('-', $row['sender']); - - $user_to_show_type = $user_to_show[0]; - $user_to_show_id = $user_to_show[1]; - $unread_message_number = $this->crud_model->count_unread_message_of_thread($row['message_thread_code']); - ?> -
    • - - - - db->get_where($user_to_show_type, array($user_to_show_type . '_id' => $user_to_show_id))->row()->name; ?> - - - - 0): ?> - - - - - -
      • - -
    - -
    - -
    \ No newline at end of file diff --git a/application/views/backend/admin/message_home.php b/application/views/backend/admin/message_home.php deleted file mode 100644 index a07c8fe..0000000 --- a/application/views/backend/admin/message_home.php +++ /dev/null @@ -1,26 +0,0 @@ -
    - -

    - -

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

    -
    - Select a message to read -
    -
    \ No newline at end of file diff --git a/application/views/backend/admin/message_new.php b/application/views/backend/admin/message_new.php deleted file mode 100644 index b5e6843..0000000 --- a/application/views/backend/admin/message_new.php +++ /dev/null @@ -1,71 +0,0 @@ -
    - -

    - -

    -
    - -
    - - 'form', 'enctype' => 'multipart/form-data')); ?> - - -
    - -

    - -
    - - -
    - -
    - -
    - - - - -
    \ No newline at end of file diff --git a/application/views/backend/admin/message_read.php b/application/views/backend/admin/message_read.php deleted file mode 100644 index 3715fe7..0000000 --- a/application/views/backend/admin/message_read.php +++ /dev/null @@ -1,44 +0,0 @@ -db->get_where('message', array('message_thread_code' => $current_message_thread_code))->result_array(); -foreach ($messages as $row): - - $sender = explode('-', $row['sender']); - $sender_account_type = $sender[0]; - $sender_id = $sender[1]; - ?> -
    - -
    - - - - db->get_where($sender_account_type, array($sender_account_type . '_id' => $sender_id))->row()->name; ?> - -
    - -
    - -
    - -
    - -
    -

    -
    - - - - 'multipart/form-data')); ?> -
    -
    - -
    -
    - -

    -
    - \ No newline at end of file diff --git a/application/views/backend/admin/modal_edit_notice.php b/application/views/backend/admin/modal_edit_notice.php index 0791de2..976ea21 100644 --- a/application/views/backend/admin/modal_edit_notice.php +++ b/application/views/backend/admin/modal_edit_notice.php @@ -32,29 +32,7 @@
    -
    - -
    - -
    - - db->get_where('settings' , array( - 'type' => 'active_sms_service'))->row()->description; - if ($active_sms_service == 'clickatell') - echo 'Clickatell ' . ('Activated'); - if ($active_sms_service == 'twilio') - echo 'Twilio ' . ('Activated'); - if ($active_sms_service == '' || $active_sms_service == 'disabled') - echo ('SMS service not activated'); - ?> - -
    -
    - +
    diff --git a/application/views/backend/admin/noticeboard.php b/application/views/backend/admin/noticeboard.php index 5e4f844..7b534f2 100644 --- a/application/views/backend/admin/noticeboard.php +++ b/application/views/backend/admin/noticeboard.php @@ -111,27 +111,6 @@
    -
    - -
    - -
    - - - -
    -
    -
    diff --git a/application/views/backend/admin/sms_settings.php b/application/views/backend/admin/sms_settings.php deleted file mode 100644 index 94e4838..0000000 --- a/application/views/backend/admin/sms_settings.php +++ /dev/null @@ -1,136 +0,0 @@ -
    -db->get_where('settings' , array( - 'type' => 'active_sms_service' - ))->row()->description; -?> -
    -
    - -
    - - - -
    - -
    - - 'form-horizontal form-groups-bordered validate','target'=>'_top'));?> - -
    - -
    - -
    -
    -
    -
    - -
    -
    - -
    - -
    - 'form-horizontal form-groups-bordered validate','target'=>'_top'));?> -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    -
    - -
    -
    - -
    -
    - 'form-horizontal form-groups-bordered validate','target'=>'_top'));?> -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    -
    - -
    -
    - -
    - -
    - -
    - -
    -
    \ No newline at end of file From 4397b3560fc8d423870354ed6a2c1637e5aa6f4f Mon Sep 17 00:00:00 2001 From: mtmzakir Date: Sun, 26 Nov 2023 23:53:42 +0530 Subject: [PATCH 04/24] Parent Update2 --- .../backend/parent/manage_attendance.php | 161 ------------------ .../views/backend/parent/manage_profile.php | 4 +- application/views/backend/parent/marks.php | 2 +- application/views/backend/parent/message.php | 63 ------- .../views/backend/parent/message_home.php | 26 --- .../views/backend/parent/message_new.php | 60 ------- .../views/backend/parent/message_read.php | 46 ----- .../backend/parent/modal_student_profile.php | 4 +- .../views/backend/parent/navigation.php | 8 - application/views/backend/parent/subject.php | 53 ------ 10 files changed, 5 insertions(+), 422 deletions(-) delete mode 100644 application/views/backend/parent/manage_attendance.php delete mode 100644 application/views/backend/parent/message.php delete mode 100644 application/views/backend/parent/message_home.php delete mode 100644 application/views/backend/parent/message_new.php delete mode 100644 application/views/backend/parent/message_read.php delete mode 100644 application/views/backend/parent/subject.php diff --git a/application/views/backend/parent/manage_attendance.php b/application/views/backend/parent/manage_attendance.php deleted file mode 100644 index 04f134d..0000000 --- a/application/views/backend/parent/manage_attendance.php +++ /dev/null @@ -1,161 +0,0 @@ - -
    - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - -
    - - - -
    -
    -
    - -
    -
    - -

    - -

    Attendance of class

    -

    -
    -
    -
    -
    - - - - - - -
    -
    - - - - - - - - - - - db->get_where('student' , array('class_id'=>$class_id))->result_array(); - - foreach($students as $row) - { - ?> - - - - - - -
    - $row['student_id'], - 'date' => $full_date); - $query = $this->db->get_where('attendance' , $verify_data); - if($query->num_rows() < 1) - $this->db->insert('attendance' , $verify_data); - - //showing the attendance status editing option - $attendance = $this->db->get_where('attendance' , $verify_data)->row(); - $status = $attendance->status; - ?> - -
    - - - - -
    -
    -
    -
    - \ No newline at end of file diff --git a/application/views/backend/parent/manage_profile.php b/application/views/backend/parent/manage_profile.php index 7983fe5..1bd267d 100644 --- a/application/views/backend/parent/manage_profile.php +++ b/application/views/backend/parent/manage_profile.php @@ -1,4 +1,4 @@ -
    +
    @@ -51,7 +51,7 @@ -
    +
    diff --git a/application/views/backend/parent/marks.php b/application/views/backend/parent/marks.php index 21ae4f8..d75021c 100644 --- a/application/views/backend/parent/marks.php +++ b/application/views/backend/parent/marks.php @@ -9,7 +9,7 @@


    -
    +
    diff --git a/application/views/backend/parent/message.php b/application/views/backend/parent/message.php deleted file mode 100644 index b7a4e7f..0000000 --- a/application/views/backend/parent/message.php +++ /dev/null @@ -1,63 +0,0 @@ -
    -
    - - -
    - - - -
    - - -
    - - - - - -
      - - session->userdata('login_type') . '-' . $this->session->userdata('login_user_id'); - - $this->db->where('sender', $current_user); - $this->db->or_where('reciever', $current_user); - $message_threads = $this->db->get('message_thread')->result_array(); - foreach ($message_threads as $row): - - // defining the user to show - if ($row['sender'] == $current_user) - $user_to_show = explode('-', $row['reciever']); - if ($row['reciever'] == $current_user) - $user_to_show = explode('-', $row['sender']); - - $user_to_show_type = $user_to_show[0]; - $user_to_show_id = $user_to_show[1]; - $unread_message_number = $this->crud_model->count_unread_message_of_thread($row['message_thread_code']); - ?> -
    • - - - - db->get_where($user_to_show_type, array($user_to_show_type . '_id' => $user_to_show_id))->row()->name; ?> - - - - 0): ?> - - - - - -
      • - -
    - -
    - -
    \ No newline at end of file diff --git a/application/views/backend/parent/message_home.php b/application/views/backend/parent/message_home.php deleted file mode 100644 index a07c8fe..0000000 --- a/application/views/backend/parent/message_home.php +++ /dev/null @@ -1,26 +0,0 @@ -
    - -

    - -

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

    -
    - Select a message to read -
    -
    \ No newline at end of file diff --git a/application/views/backend/parent/message_new.php b/application/views/backend/parent/message_new.php deleted file mode 100644 index ab0d6bd..0000000 --- a/application/views/backend/parent/message_new.php +++ /dev/null @@ -1,60 +0,0 @@ -
    - -

    - -

    -
    - -
    - - 'form', 'enctype' => 'multipart/form-data')); ?> - - -
    - -

    - -
    - - -
    - -
    - -
    - - - - -
    \ No newline at end of file diff --git a/application/views/backend/parent/message_read.php b/application/views/backend/parent/message_read.php deleted file mode 100644 index 7573e56..0000000 --- a/application/views/backend/parent/message_read.php +++ /dev/null @@ -1,46 +0,0 @@ -db->get_where('message', array('message_thread_code' => $current_message_thread_code))->result_array(); -foreach ($messages as $row): - - $sender = explode('-', $row['sender']); - $sender_account_type = $sender[0]; - $sender_id = $sender[1]; - ?> -
    - -
    - - - - - - db->get_where($sender_account_type, array($sender_account_type . '_id' => $sender_id))->row()->name; ?> - -
    - -
    - -
    - -
    - -
    -

    -
    - - - - 'multipart/form-data')); ?> -
    -
    - -
    -
    - -

    -
    - \ No newline at end of file diff --git a/application/views/backend/parent/modal_student_profile.php b/application/views/backend/parent/modal_student_profile.php index ae761a3..75d82c6 100644 --- a/application/views/backend/parent/modal_student_profile.php +++ b/application/views/backend/parent/modal_student_profile.php @@ -4,7 +4,7 @@
    -
    +
    @@ -32,7 +32,7 @@ class="img-responsive img-circle" />
    -
    +

    diff --git a/application/views/backend/parent/navigation.php b/application/views/backend/parent/navigation.php index 73cdad9..fa1a5e1 100644 --- a/application/views/backend/parent/navigation.php +++ b/application/views/backend/parent/navigation.php @@ -98,14 +98,6 @@
    • - -
  • - - - - -
    • -
  • diff --git a/application/views/backend/parent/subject.php b/application/views/backend/parent/subject.php deleted file mode 100644 index 4b680e0..0000000 --- a/application/views/backend/parent/subject.php +++ /dev/null @@ -1,53 +0,0 @@ -
    -
    - - - - -
    - -
    - - - - - - - - - - - - - - - - - - -
    crud_model->get_type_name_by_id('class',$row['class_id']);?>crud_model->get_type_name_by_id('teacher',$row['teacher_id']);?>
    -
    - -
    -
    -
    - - - - \ No newline at end of file From 11b4781177cf63bafdb8937ab8ca6a3b30261054 Mon Sep 17 00:00:00 2001 From: mtmzakir Date: Sun, 26 Nov 2023 23:58:14 +0530 Subject: [PATCH 05/24] Parent Update3 --- application/views/.DS_Store | Bin 0 -> 6148 bytes application/views/backend/.DS_Store | Bin 0 -> 6148 bytes application/views/backend/parent/class.php | 134 --------------------- 3 files changed, 134 deletions(-) create mode 100644 application/views/.DS_Store create mode 100644 application/views/backend/.DS_Store delete mode 100644 application/views/backend/parent/class.php diff --git a/application/views/.DS_Store b/application/views/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..3aa42c4b765d60878f0d02ad91b33cd00961dc03 GIT binary patch literal 6148 zcmeHK%}T>S5T3QwBov_sg&qT53)Z#=i}><<8l{wz8Ir~`nFjZl!XM##L@wPk_{g_6rMkUiS&mh+Zv96&_wyj1P5Z&*nno8= zreUcE;bjufhxNTvndL!}#S@i~L@|ckTqRi~=Y2WLqN&RDwZn02XIO767M%8;vTLw}S5&@K_3TfwRAvw8DYMFGMrME+ zUQrH#7(%C`-8FHZ!9t@>2ccHRdCbb?<3*^|(eA2n5S~WvnE_^Cm4S*L*6I8| z!(V3YBY!o8N6Y{-@Xr_!)qy|gV^QX8{Z<~GwJx?hY$Oy{kb;8x$|V2?w2w5DQ~O=g aG0rnsXrx)luF?_tBA^K2jv4p`20j2*H%veP literal 0 HcmV?d00001 diff --git a/application/views/backend/.DS_Store b/application/views/backend/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..1ab7b64b8cf7c4eabb9ac2bee8ed9f04a8695249 GIT binary patch literal 6148 zcmeHK%}T>S5T0#o+fala6nb3nTClb~SiFQ-U%-eSRBA$t24l9gsX3HF&iX<=iO=KA z?&c6IcoVTRu=~x<&u->}><<74Z#6vuXahhK8=)X&i;#J%t73x*g`OjUG|ZOsFjnD~ ziTFOOeqez12Z@c)wU`^!TL*S@eI|d6kOXylOAtznuEpFSdQgN( zMKr0xJ~4zzN4vCfuEpG-Ne7`<#(C_@#p6Zj)zL0>I0)Au_sjq@P-dWNhHX0kFYuSy z`p7S*@Q4{;2L2fXqBi!&9u{TK)^Fv}Su3$UU?ZWpoD>w)OP2r~&_2@9PUDxPW1MR- WH%POPU8f`RML-k69W(F?4157P8B9I^ literal 0 HcmV?d00001 diff --git a/application/views/backend/parent/class.php b/application/views/backend/parent/class.php deleted file mode 100644 index aad2ffa..0000000 --- a/application/views/backend/parent/class.php +++ /dev/null @@ -1,134 +0,0 @@ -
    -
    - - - - - -
    - -
    - - - - - - - - - - - - - - - - - - - - - - -
    #
    crud_model->get_type_name_by_id('teacher',$row['teacher_id']);?> -
    - - -
    -
    -
    - - - - -
    -
    - 'form-horizontal form-groups-bordered validate','target'=>'_top'));?> -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    -
    -
    - -
    -
    - -
    -
    - -
    -
    -
    - - - - - \ No newline at end of file From a547cb63ba5d0e29532017fe10f119ea20e81b78 Mon Sep 17 00:00:00 2001 From: mtmzakir Date: Mon, 27 Nov 2023 00:05:43 +0530 Subject: [PATCH 06/24] Student Update1 --- .../views/backend/parent/navigation.php | 2 +- application/views/backend/student/class.php | 2 +- .../views/backend/student/class_routine.php | 2 +- .../views/backend/student/dashboard.php | 6 +- application/views/backend/student/invoice.php | 2 +- .../views/backend/student/manage_profile.php | 4 +- application/views/backend/student/marks.php | 2 +- application/views/backend/student/message.php | 63 ------------------- .../views/backend/student/message_home.php | 26 -------- .../views/backend/student/message_new.php | 60 ------------------ .../views/backend/student/message_read.php | 44 ------------- .../backend/student/modal_student_profile.php | 4 +- .../views/backend/student/navigation.php | 13 +--- .../views/backend/student/noticeboard.php | 2 +- application/views/backend/student/subject.php | 2 +- application/views/backend/student/teacher.php | 2 +- .../views/backend/student/transport.php | 2 +- 17 files changed, 18 insertions(+), 220 deletions(-) delete mode 100644 application/views/backend/student/message.php delete mode 100644 application/views/backend/student/message_home.php delete mode 100644 application/views/backend/student/message_new.php delete mode 100644 application/views/backend/student/message_read.php diff --git a/application/views/backend/parent/navigation.php b/application/views/backend/parent/navigation.php index fa1a5e1..bbcf84c 100644 --- a/application/views/backend/parent/navigation.php +++ b/application/views/backend/parent/navigation.php @@ -1,4 +1,4 @@ -
    +
    diff --git a/application/views/backend/student/class.php b/application/views/backend/student/class.php index 42750ec..1f6c1c2 100644 --- a/application/views/backend/student/class.php +++ b/application/views/backend/student/class.php @@ -1,4 +1,4 @@ -
    +
    diff --git a/application/views/backend/student/class_routine.php b/application/views/backend/student/class_routine.php index ee36e1c..7b4ba6a 100644 --- a/application/views/backend/student/class_routine.php +++ b/application/views/backend/student/class_routine.php @@ -1,4 +1,4 @@ -
    +
    diff --git a/application/views/backend/student/dashboard.php b/application/views/backend/student/dashboard.php index c01d09c..562ad1e 100644 --- a/application/views/backend/student/dashboard.php +++ b/application/views/backend/student/dashboard.php @@ -1,6 +1,6 @@ -
    +
    -
    +
    @@ -23,7 +23,7 @@
    -
    +
    diff --git a/application/views/backend/student/invoice.php b/application/views/backend/student/invoice.php index ca232c7..4af6ff3 100644 --- a/application/views/backend/student/invoice.php +++ b/application/views/backend/student/invoice.php @@ -1,4 +1,4 @@ -
    +
    diff --git a/application/views/backend/student/manage_profile.php b/application/views/backend/student/manage_profile.php index c8f546c..d98ef91 100644 --- a/application/views/backend/student/manage_profile.php +++ b/application/views/backend/student/manage_profile.php @@ -1,4 +1,4 @@ -
    +
    @@ -75,7 +75,7 @@ -
    +
    diff --git a/application/views/backend/student/marks.php b/application/views/backend/student/marks.php index eaea5ad..79f3e6f 100644 --- a/application/views/backend/student/marks.php +++ b/application/views/backend/student/marks.php @@ -1,4 +1,4 @@ -
    +
    diff --git a/application/views/backend/student/message.php b/application/views/backend/student/message.php deleted file mode 100644 index cd79656..0000000 --- a/application/views/backend/student/message.php +++ /dev/null @@ -1,63 +0,0 @@ -
    -
    - - -
    - - - -
    - - -
    - - - - - -
      - - session->userdata('login_type') . '-' . $this->session->userdata('login_user_id'); - - $this->db->where('sender', $current_user); - $this->db->or_where('reciever', $current_user); - $message_threads = $this->db->get('message_thread')->result_array(); - foreach ($message_threads as $row): - - // defining the user to show - if ($row['sender'] == $current_user) - $user_to_show = explode('-', $row['reciever']); - if ($row['reciever'] == $current_user) - $user_to_show = explode('-', $row['sender']); - - $user_to_show_type = $user_to_show[0]; - $user_to_show_id = $user_to_show[1]; - $unread_message_number = $this->crud_model->count_unread_message_of_thread($row['message_thread_code']); - ?> -
    • - - - - db->get_where($user_to_show_type, array($user_to_show_type . '_id' => $user_to_show_id))->row()->name; ?> - - - - 0): ?> - - - - - -
      • - -
    - -
    - -
    \ No newline at end of file diff --git a/application/views/backend/student/message_home.php b/application/views/backend/student/message_home.php deleted file mode 100644 index a07c8fe..0000000 --- a/application/views/backend/student/message_home.php +++ /dev/null @@ -1,26 +0,0 @@ -
    - -

    - -

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

    -
    - Select a message to read -
    -
    \ No newline at end of file diff --git a/application/views/backend/student/message_new.php b/application/views/backend/student/message_new.php deleted file mode 100644 index 8ed7332..0000000 --- a/application/views/backend/student/message_new.php +++ /dev/null @@ -1,60 +0,0 @@ -
    - -

    - -

    -
    - -
    - - 'form', 'enctype' => 'multipart/form-data')); ?> - - -
    - -

    - -
    - - -
    - -
    - -
    - - - - -
    \ No newline at end of file diff --git a/application/views/backend/student/message_read.php b/application/views/backend/student/message_read.php deleted file mode 100644 index 8fb2e0f..0000000 --- a/application/views/backend/student/message_read.php +++ /dev/null @@ -1,44 +0,0 @@ -db->get_where('message', array('message_thread_code' => $current_message_thread_code))->result_array(); -foreach ($messages as $row): - - $sender = explode('-', $row['sender']); - $sender_account_type = $sender[0]; - $sender_id = $sender[1]; - ?> -
    - -
    - - - - db->get_where($sender_account_type, array($sender_account_type . '_id' => $sender_id))->row()->name; ?> - -
    - -
    - -
    - -
    - -
    -

    -
    - - - - 'multipart/form-data')); ?> -
    -
    - -
    -
    - -

    -
    - \ No newline at end of file diff --git a/application/views/backend/student/modal_student_profile.php b/application/views/backend/student/modal_student_profile.php index ae761a3..75d82c6 100644 --- a/application/views/backend/student/modal_student_profile.php +++ b/application/views/backend/student/modal_student_profile.php @@ -4,7 +4,7 @@
    -
    +
    @@ -32,7 +32,7 @@ class="img-responsive img-circle" />
    -
    +

    diff --git a/application/views/backend/student/navigation.php b/application/views/backend/student/navigation.php index 8bb42f1..7b0099e 100644 --- a/application/views/backend/student/navigation.php +++ b/application/views/backend/student/navigation.php @@ -1,4 +1,4 @@ -
    +
    @@ -93,16 +93,7 @@
    • - - - -
  • - - - - -
    • - +
  • diff --git a/application/views/backend/student/noticeboard.php b/application/views/backend/student/noticeboard.php index 3e4b7ba..911f8dd 100644 --- a/application/views/backend/student/noticeboard.php +++ b/application/views/backend/student/noticeboard.php @@ -1,4 +1,4 @@ -
    +
    diff --git a/application/views/backend/student/subject.php b/application/views/backend/student/subject.php index 3116b32..3847d59 100644 --- a/application/views/backend/student/subject.php +++ b/application/views/backend/student/subject.php @@ -1,4 +1,4 @@ -
    +
    diff --git a/application/views/backend/student/teacher.php b/application/views/backend/student/teacher.php index 6e0d408..f0c1162 100644 --- a/application/views/backend/student/teacher.php +++ b/application/views/backend/student/teacher.php @@ -1,5 +1,5 @@ - +
    diff --git a/application/views/backend/student/transport.php b/application/views/backend/student/transport.php index 5b07d34..bb9d233 100644 --- a/application/views/backend/student/transport.php +++ b/application/views/backend/student/transport.php @@ -1,4 +1,4 @@ -
    +
    From 49f1bc44b3ef9c9c31ecdd257f9316d03bede914 Mon Sep 17 00:00:00 2001 From: mtmzakir Date: Mon, 27 Nov 2023 00:11:44 +0530 Subject: [PATCH 07/24] Student Update2 --- application/views/backend/.DS_Store | Bin 6148 -> 6148 bytes application/views/backend/student/class.php | 134 ------------------ application/views/backend/student/invoice.php | 60 -------- .../backend/student/student_information.php | 123 ---------------- .../backend/student/student_marksheet.php | 49 ------- .../views/backend/student/study_material.php | 71 ---------- .../views/backend/student/transport.php | 46 ------ 7 files changed, 483 deletions(-) delete mode 100644 application/views/backend/student/class.php delete mode 100644 application/views/backend/student/invoice.php delete mode 100644 application/views/backend/student/student_information.php delete mode 100644 application/views/backend/student/student_marksheet.php delete mode 100644 application/views/backend/student/study_material.php delete mode 100644 application/views/backend/student/transport.php diff --git a/application/views/backend/.DS_Store b/application/views/backend/.DS_Store index 1ab7b64b8cf7c4eabb9ac2bee8ed9f04a8695249..5252b25f5c83d1521c8584ce787fa73eaf2f4f00 100644 GIT binary patch delta 90 zcmZoMXfc=|#>B)qu~2NHo+2a5#DLw41(+BaStj!^e&%FnC}t>OC}l{QEXH^i!Q1?b kQIlmeI|n}pQ0Hbwrti#?`9&-_7#SFVh=E~qfXEhR0OkJ_LI3~& delta 68 zcmZoMXfc=|#>B`mu~2NHo+2aD#DLwC4MbQb^D}+e{DoPVWfRL+#?9;;{2V|vn?Evt XXP(S2V#&b(1dI#}Oq&BlwlD(#o~jYr diff --git a/application/views/backend/student/class.php b/application/views/backend/student/class.php deleted file mode 100644 index 1f6c1c2..0000000 --- a/application/views/backend/student/class.php +++ /dev/null @@ -1,134 +0,0 @@ -
    -
    - - - - - -
    - -
    - -
    - - - - - - - - - - - - - - - - - - - - -
    #
    crud_model->get_type_name_by_id('teacher',$row['teacher_id']);?> -
    - - -
    -
    -
    - - - - -
    -
    - 'form-horizontal form-groups-bordered validate','target'=>'_top'));?> -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    -
    -
    - -
    -
    - -
    -
    - -
    -
    -
    - - - - - \ No newline at end of file diff --git a/application/views/backend/student/invoice.php b/application/views/backend/student/invoice.php deleted file mode 100644 index 4af6ff3..0000000 --- a/application/views/backend/student/invoice.php +++ /dev/null @@ -1,60 +0,0 @@ -
    -
    - - - - -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - -
    crud_model->get_type_name_by_id('student',$row['student_id']);?> - - - - - - - - -
    -
    - - - - - -
    -
    -
    - diff --git a/application/views/backend/student/student_information.php b/application/views/backend/student/student_information.php deleted file mode 100644 index f97c7e3..0000000 --- a/application/views/backend/student/student_information.php +++ /dev/null @@ -1,123 +0,0 @@ - - - - - -

    - - - - - - - - - - - - - db->get_where('student' , array('class_id'=>$class_id))->result_array(); - foreach($students as $row):?> - - - - - - - - - - -
    - -
    - - -
    - -
    - - - - - \ No newline at end of file diff --git a/application/views/backend/student/student_marksheet.php b/application/views/backend/student/student_marksheet.php deleted file mode 100644 index f1cb147..0000000 --- a/application/views/backend/student/student_marksheet.php +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - db->get_where('student' , array('class_id'=>$class_id))->result_array(); - foreach($students as $row):?> - - - - - - - - -
    - - - - - - -
    - - - - - \ No newline at end of file diff --git a/application/views/backend/student/study_material.php b/application/views/backend/student/study_material.php deleted file mode 100644 index eced171..0000000 --- a/application/views/backend/student/study_material.php +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - -
    #
    - db->get_where('class' , array('class_id' => $row['class_id'] ))->row()->name; - echo $name;?> - - - - Download - -
    - - \ No newline at end of file diff --git a/application/views/backend/student/transport.php b/application/views/backend/student/transport.php deleted file mode 100644 index bb9d233..0000000 --- a/application/views/backend/student/transport.php +++ /dev/null @@ -1,46 +0,0 @@ -
    -
    - - - - - - -
    - -
    - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - -
    -
    -
    \ No newline at end of file From 0d87bb10c0224ae799fd8260b4d5416996c9aad3 Mon Sep 17 00:00:00 2001 From: mtmzakir Date: Mon, 27 Nov 2023 00:22:58 +0530 Subject: [PATCH 08/24] Teacher Update1 --- application/views/backend/.DS_Store | Bin 6148 -> 6148 bytes .../{teacher => student}/transport.php | 6 +- application/views/backend/teacher/class.php | 2 +- .../views/backend/teacher/class_routine.php | 2 +- .../views/backend/teacher/dashboard.php | 6 +- .../backend/teacher/manage_attendance.php | 6 +- .../views/backend/teacher/manage_profile.php | 4 +- application/views/backend/teacher/marks.php | 2 +- application/views/backend/teacher/message.php | 63 ------------ .../views/backend/teacher/message_home.php | 26 ----- .../views/backend/teacher/message_new.php | 71 -------------- .../views/backend/teacher/message_read.php | 44 --------- .../backend/teacher/modal_edit_subject.php | 2 +- .../backend/teacher/modal_student_edit.php | 2 +- .../teacher/modal_student_marksheet.php | 16 ++- .../backend/teacher/modal_student_profile.php | 4 +- .../teacher/modal_study_material_add.php | 91 ------------------ .../teacher/modal_study_material_edit.php | 75 --------------- .../views/backend/teacher/navigation.php | 12 +-- .../views/backend/teacher/noticeboard.php | 2 +- .../views/backend/teacher/student_add.php | 2 +- .../backend/teacher/student_information.php | 2 +- .../backend/teacher/student_marksheet.php | 2 +- .../views/backend/teacher/study_material.php | 90 ----------------- application/views/backend/teacher/subject.php | 2 +- application/views/backend/teacher/teacher.php | 2 +- 26 files changed, 31 insertions(+), 505 deletions(-) rename application/views/backend/{teacher => student}/transport.php (86%) delete mode 100644 application/views/backend/teacher/message.php delete mode 100644 application/views/backend/teacher/message_home.php delete mode 100644 application/views/backend/teacher/message_new.php delete mode 100644 application/views/backend/teacher/message_read.php delete mode 100644 application/views/backend/teacher/modal_study_material_add.php delete mode 100644 application/views/backend/teacher/modal_study_material_edit.php delete mode 100644 application/views/backend/teacher/study_material.php diff --git a/application/views/backend/.DS_Store b/application/views/backend/.DS_Store index 5252b25f5c83d1521c8584ce787fa73eaf2f4f00..4eab0c768320391fed304dd5eca14412beba3648 100644 GIT binary patch delta 95 zcmZoMXfc=|#>B!ku~2NHo+2ab#(>?7i&&T#SvT`AJ!h0=XDDGvWk_U5X2<~2MPf|sz`z8QX4o7dvW6J|l>HZk delta 64 zcmZoMXfc=|#>B)qu~2NHo+2a5#(>?7j4YdZSe`R(7U2+P+04cvzyXxsEXeVlc{0C< SBL@QzFfuT(Y>p6F!wdlSLk;Qx diff --git a/application/views/backend/teacher/transport.php b/application/views/backend/student/transport.php similarity index 86% rename from application/views/backend/teacher/transport.php rename to application/views/backend/student/transport.php index 28444e1..bb9d233 100644 --- a/application/views/backend/teacher/transport.php +++ b/application/views/backend/student/transport.php @@ -1,4 +1,4 @@ -
    +
    @@ -17,10 +17,10 @@ - + - + diff --git a/application/views/backend/teacher/class.php b/application/views/backend/teacher/class.php index cafc548..815894b 100644 --- a/application/views/backend/teacher/class.php +++ b/application/views/backend/teacher/class.php @@ -1,4 +1,4 @@ -
    +
    diff --git a/application/views/backend/teacher/class_routine.php b/application/views/backend/teacher/class_routine.php index 42456f3..5ff48b5 100644 --- a/application/views/backend/teacher/class_routine.php +++ b/application/views/backend/teacher/class_routine.php @@ -1,4 +1,4 @@ -
    +
    diff --git a/application/views/backend/teacher/dashboard.php b/application/views/backend/teacher/dashboard.php index b257abd..86e72be 100644 --- a/application/views/backend/teacher/dashboard.php +++ b/application/views/backend/teacher/dashboard.php @@ -1,6 +1,6 @@ -
    +
    -
    +
    @@ -23,7 +23,7 @@
    -
    +
    diff --git a/application/views/backend/teacher/manage_attendance.php b/application/views/backend/teacher/manage_attendance.php index 268054c..e3d393c 100644 --- a/application/views/backend/teacher/manage_attendance.php +++ b/application/views/backend/teacher/manage_attendance.php @@ -84,7 +84,7 @@
    -
    +
    @@ -109,7 +109,7 @@ class="btn btn-info">
    -
    +
    @@ -162,7 +162,7 @@ class="btn btn-info"> -
    +
    +
    @@ -71,7 +71,7 @@ -
    +
    diff --git a/application/views/backend/teacher/marks.php b/application/views/backend/teacher/marks.php index f2ae549..54bc356 100644 --- a/application/views/backend/teacher/marks.php +++ b/application/views/backend/teacher/marks.php @@ -1,4 +1,4 @@ -
    +
    diff --git a/application/views/backend/teacher/message.php b/application/views/backend/teacher/message.php deleted file mode 100644 index c347d4b..0000000 --- a/application/views/backend/teacher/message.php +++ /dev/null @@ -1,63 +0,0 @@ -
    -
    - - -
    - - - -
    - - -
    - - - - - -
      - - session->userdata('login_type') . '-' . $this->session->userdata('login_user_id'); - - $this->db->where('sender', $current_user); - $this->db->or_where('reciever', $current_user); - $message_threads = $this->db->get('message_thread')->result_array(); - foreach ($message_threads as $row): - - // defining the user to show - if ($row['sender'] == $current_user) - $user_to_show = explode('-', $row['reciever']); - if ($row['reciever'] == $current_user) - $user_to_show = explode('-', $row['sender']); - - $user_to_show_type = $user_to_show[0]; - $user_to_show_id = $user_to_show[1]; - $unread_message_number = $this->crud_model->count_unread_message_of_thread($row['message_thread_code']); - ?> -
    • - - - - db->get_where($user_to_show_type, array($user_to_show_type . '_id' => $user_to_show_id))->row()->name; ?> - - - - 0): ?> - - - - - -
      • - -
    - -
    - -
    \ No newline at end of file diff --git a/application/views/backend/teacher/message_home.php b/application/views/backend/teacher/message_home.php deleted file mode 100644 index a07c8fe..0000000 --- a/application/views/backend/teacher/message_home.php +++ /dev/null @@ -1,26 +0,0 @@ -
    - -

    - -

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

    -
    - Select a message to read -
    -
    \ No newline at end of file diff --git a/application/views/backend/teacher/message_new.php b/application/views/backend/teacher/message_new.php deleted file mode 100644 index 87f935d..0000000 --- a/application/views/backend/teacher/message_new.php +++ /dev/null @@ -1,71 +0,0 @@ -
    - -

    - -

    -
    - -
    - - 'form', 'enctype' => 'multipart/form-data')); ?> - - -
    - -

    - -
    - - -
    - -
    - -
    - - - - -
    \ No newline at end of file diff --git a/application/views/backend/teacher/message_read.php b/application/views/backend/teacher/message_read.php deleted file mode 100644 index 3135b98..0000000 --- a/application/views/backend/teacher/message_read.php +++ /dev/null @@ -1,44 +0,0 @@ -db->get_where('message', array('message_thread_code' => $current_message_thread_code))->result_array(); -foreach ($messages as $row): - - $sender = explode('-', $row['sender']); - $sender_account_type = $sender[0]; - $sender_id = $sender[1]; - ?> -
    - -
    - - - - db->get_where($sender_account_type, array($sender_account_type . '_id' => $sender_id))->row()->name; ?> - -
    - -
    - -
    - -
    - -
    -

    -
    - - - - 'multipart/form-data')); ?> -
    -
    - -
    -
    - -

    -
    - \ No newline at end of file diff --git a/application/views/backend/teacher/modal_edit_subject.php b/application/views/backend/teacher/modal_edit_subject.php index 18a6fe1..4724fa9 100644 --- a/application/views/backend/teacher/modal_edit_subject.php +++ b/application/views/backend/teacher/modal_edit_subject.php @@ -2,7 +2,7 @@ $edit_data = $this->db->get_where('subject' , array('subject_id' => $param2) )->result_array(); foreach ( $edit_data as $row): ?> -
    +
    diff --git a/application/views/backend/teacher/modal_student_edit.php b/application/views/backend/teacher/modal_student_edit.php index efa5c31..4d8e5b2 100644 --- a/application/views/backend/teacher/modal_student_edit.php +++ b/application/views/backend/teacher/modal_student_edit.php @@ -2,7 +2,7 @@ $edit_data = $this->db->get_where('student' , array('student_id' => $param2) )->result_array(); foreach ( $edit_data as $row): ?> -
    +
    diff --git a/application/views/backend/teacher/modal_student_marksheet.php b/application/views/backend/teacher/modal_student_marksheet.php index 1399471..3e84784 100644 --- a/application/views/backend/teacher/modal_student_marksheet.php +++ b/application/views/backend/teacher/modal_student_marksheet.php @@ -3,6 +3,9 @@ width : 100%; height : 250px; font-size : 11px; + color:#001911; + font-family: system-ui; + font-size:14px; } @@ -11,9 +14,9 @@ foreach ($student_info as $row1): ?>
    -
    +
    -
    +
    -
    + @@ -106,7 +103,6 @@
    Total Marks :
    - GPA(grade point average) :
    \ No newline at end of file diff --git a/application/views/backend/teacher/subject.php b/application/views/backend/teacher/subject.php index bd87180..12d9cee 100644 --- a/application/views/backend/teacher/subject.php +++ b/application/views/backend/teacher/subject.php @@ -1,4 +1,4 @@ -
    +
    diff --git a/application/views/backend/teacher/teacher.php b/application/views/backend/teacher/teacher.php index 6e0d408..f0c1162 100644 --- a/application/views/backend/teacher/teacher.php +++ b/application/views/backend/teacher/teacher.php @@ -1,5 +1,5 @@ -
    - crud_model->get_grade($row3['mark_obtained']); - echo $grade['name']; - $total_grade_point += $grade['grade_point']; - ?> -
    +
    From 05b62a837a591c79aa1f083c0d147a022776a57d Mon Sep 17 00:00:00 2001 From: mtmzakir Date: Mon, 27 Nov 2023 02:10:05 +0530 Subject: [PATCH 09/24] Admin Update3 --- .../views/backend/admin/class_routine.php | 38 +- application/views/backend/admin/dashboard.php | 27 +- application/views/backend/admin/grade.php | 2 +- .../views/backend/admin/manage_attendance.php | 2 +- .../views/backend/admin/manage_profile.php | 2 +- application/views/backend/admin/marks.php | 12 +- .../views/backend/admin/modal_edit_class.php | 4 +- .../admin/modal_edit_class_routine.php | 10 +- .../views/backend/admin/modal_edit_exam.php | 4 +- .../views/backend/admin/modal_edit_grade.php | 4 +- .../views/backend/admin/modal_edit_notice.php | 4 +- .../backend/admin/modal_edit_subject.php | 2 +- .../backend/admin/modal_edit_teacher.php | 2 +- .../views/backend/admin/modal_parent_edit.php | 4 +- .../backend/admin/modal_student_edit.php | 2 +- .../backend/admin/modal_student_marksheet.php | 15 +- .../backend/admin/modal_teacher_edit.php | 2 +- .../views/backend/admin/navigation.php | 57 +- .../views/backend/admin/noticeboard.php | 2 +- .../backend/admin/onlineAdmissionRept.php | 384 ------------- .../views/backend/admin/online_admission.php | 503 ------------------ .../views/backend/admin/section_edit.php | 4 +- .../views/backend/admin/student_add.php | 2 +- .../backend/admin/student_information.php | 2 +- .../views/backend/admin/student_marksheet.php | 2 +- .../views/backend/admin/system_settings.php | 8 +- application/views/backend/chat.php | 112 ---- 27 files changed, 89 insertions(+), 1123 deletions(-) delete mode 100644 application/views/backend/admin/onlineAdmissionRept.php delete mode 100644 application/views/backend/admin/online_admission.php delete mode 100644 application/views/backend/chat.php diff --git a/application/views/backend/admin/class_routine.php b/application/views/backend/admin/class_routine.php index 8c15178..b587d66 100644 --- a/application/views/backend/admin/class_routine.php +++ b/application/views/backend/admin/class_routine.php @@ -30,7 +30,7 @@

    - Class +

    @@ -42,13 +42,13 @@     @@ -136,13 +136,13 @@
    @@ -155,8 +155,8 @@ @@ -169,8 +169,8 @@ diff --git a/application/views/backend/admin/dashboard.php b/application/views/backend/admin/dashboard.php index dfd67bc..9734bba 100644 --- a/application/views/backend/admin/dashboard.php +++ b/application/views/backend/admin/dashboard.php @@ -7,7 +7,7 @@
    -
    +
    0
    @@ -18,7 +18,7 @@
    -
    +
    0
    @@ -30,7 +30,7 @@
    -
    +
    date('Y-m-d'), 'status' => '1'); @@ -48,7 +48,7 @@
    -
    +
    0
    @@ -60,7 +60,7 @@
    -
    +
    0
    @@ -70,24 +70,9 @@
    - - -
    - -
    -
    -
    num_rows(); ?>" data-postfix="" data-duration="500" data-delay="0">0
    - -

    - -
    - -
    -
    -
    +
    0
    diff --git a/application/views/backend/admin/grade.php b/application/views/backend/admin/grade.php index fd873b2..ac31898 100644 --- a/application/views/backend/admin/grade.php +++ b/application/views/backend/admin/grade.php @@ -5,7 +5,7 @@
    - +
    diff --git a/application/views/backend/admin/manage_profile.php b/application/views/backend/admin/manage_profile.php index 5a7475e..af51d3e 100644 --- a/application/views/backend/admin/manage_profile.php +++ b/application/views/backend/admin/manage_profile.php @@ -97,7 +97,7 @@
    - +
    diff --git a/application/views/backend/admin/marks.php b/application/views/backend/admin/marks.php index a6bba34..e36579b 100644 --- a/application/views/backend/admin/marks.php +++ b/application/views/backend/admin/marks.php @@ -25,14 +25,14 @@ - + db->get('class')->result_array(); foreach($classes as $row): ?> + @@ -63,7 +63,7 @@ id="subject_id_" style="display:;" class="form-control" style="float:left;"> - + crud_model->get_subjects_by_class($row['class_id']); @@ -81,7 +81,7 @@ diff --git a/application/views/backend/admin/modal_edit_class.php b/application/views/backend/admin/modal_edit_class.php index 759e888..1becfc2 100644 --- a/application/views/backend/admin/modal_edit_class.php +++ b/application/views/backend/admin/modal_edit_class.php @@ -8,7 +8,7 @@
    - +
    @@ -47,7 +47,7 @@
    - +
    diff --git a/application/views/backend/admin/modal_edit_class_routine.php b/application/views/backend/admin/modal_edit_class_routine.php index c733448..fd43363 100644 --- a/application/views/backend/admin/modal_edit_class_routine.php +++ b/application/views/backend/admin/modal_edit_class_routine.php @@ -74,8 +74,8 @@
    @@ -104,14 +104,14 @@
    - +
    diff --git a/application/views/backend/admin/modal_edit_exam.php b/application/views/backend/admin/modal_edit_exam.php index 8e8caba..6da9abb 100644 --- a/application/views/backend/admin/modal_edit_exam.php +++ b/application/views/backend/admin/modal_edit_exam.php @@ -8,7 +8,7 @@
    - +
    @@ -35,7 +35,7 @@
    - +
    diff --git a/application/views/backend/admin/modal_edit_grade.php b/application/views/backend/admin/modal_edit_grade.php index df341dc..55e9556 100644 --- a/application/views/backend/admin/modal_edit_grade.php +++ b/application/views/backend/admin/modal_edit_grade.php @@ -8,7 +8,7 @@
    - +
    @@ -47,7 +47,7 @@
    - +
    diff --git a/application/views/backend/admin/modal_edit_notice.php b/application/views/backend/admin/modal_edit_notice.php index 976ea21..cce36b8 100644 --- a/application/views/backend/admin/modal_edit_notice.php +++ b/application/views/backend/admin/modal_edit_notice.php @@ -1,7 +1,7 @@ db->get_where('noticeboard' , array('notice_id' => $param2) )->result_array(); ?> -
    +
    'form-horizontal form-groups-bordered validate','target'=>'_top'));?> @@ -36,7 +36,7 @@
    - +
    diff --git a/application/views/backend/admin/modal_edit_subject.php b/application/views/backend/admin/modal_edit_subject.php index eccfa65..3876c88 100644 --- a/application/views/backend/admin/modal_edit_subject.php +++ b/application/views/backend/admin/modal_edit_subject.php @@ -58,7 +58,7 @@
    - +
    diff --git a/application/views/backend/admin/modal_edit_teacher.php b/application/views/backend/admin/modal_edit_teacher.php index 37db228..632b327 100644 --- a/application/views/backend/admin/modal_edit_teacher.php +++ b/application/views/backend/admin/modal_edit_teacher.php @@ -57,7 +57,7 @@
    - +
    diff --git a/application/views/backend/admin/modal_parent_edit.php b/application/views/backend/admin/modal_parent_edit.php index 1397e65..f88d8e1 100644 --- a/application/views/backend/admin/modal_parent_edit.php +++ b/application/views/backend/admin/modal_parent_edit.php @@ -9,7 +9,7 @@
    - +
    @@ -59,7 +59,7 @@
    - +
    diff --git a/application/views/backend/admin/modal_student_edit.php b/application/views/backend/admin/modal_student_edit.php index 835cc05..e6a23c5 100644 --- a/application/views/backend/admin/modal_student_edit.php +++ b/application/views/backend/admin/modal_student_edit.php @@ -155,7 +155,7 @@
    - +
    diff --git a/application/views/backend/admin/modal_student_marksheet.php b/application/views/backend/admin/modal_student_marksheet.php index 317c084..7931985 100644 --- a/application/views/backend/admin/modal_student_marksheet.php +++ b/application/views/backend/admin/modal_student_marksheet.php @@ -3,6 +3,9 @@ width : 100%; height : 250px; font-size : 11px; + color:#001911; + font-family: system-ui; + font-size:14px; } @@ -11,9 +14,9 @@ foreach ($student_info as $row1): ?>
    -
    +
    -
    +
    diff --git a/application/views/backend/admin/section_edit.php b/application/views/backend/admin/section_edit.php index ab3e637..e8a7b82 100644 --- a/application/views/backend/admin/section_edit.php +++ b/application/views/backend/admin/section_edit.php @@ -11,7 +11,7 @@
    - +
    @@ -82,7 +82,7 @@
    - +
    diff --git a/application/views/backend/admin/student_add.php b/application/views/backend/admin/student_add.php index 01fadb6..7fedb6c 100644 --- a/application/views/backend/admin/student_add.php +++ b/application/views/backend/admin/student_add.php @@ -72,7 +72,7 @@
    - +
    diff --git a/application/views/backend/admin/student_information.php b/application/views/backend/admin/student_information.php index 61dc92f..7f22335 100644 --- a/application/views/backend/admin/student_information.php +++ b/application/views/backend/admin/student_information.php @@ -38,7 +38,7 @@ class="btn btn-primary pull-right"> - + diff --git a/application/views/backend/admin/student_marksheet.php b/application/views/backend/admin/student_marksheet.php index b9f5a76..db61a16 100644 --- a/application/views/backend/admin/student_marksheet.php +++ b/application/views/backend/admin/student_marksheet.php @@ -47,7 +47,7 @@
    		- + diff --git a/application/views/backend/admin/system_settings.php b/application/views/backend/admin/system_settings.php index 98a838b..c2b826b 100644 --- a/application/views/backend/admin/system_settings.php +++ b/application/views/backend/admin/system_settings.php @@ -75,7 +75,7 @@
    - +
    @@ -128,7 +128,7 @@ - + @@ -141,7 +141,7 @@ - + @@ -150,7 +150,7 @@
    - +
    diff --git a/application/views/backend/chat.php b/application/views/backend/chat.php deleted file mode 100644 index 74d94fa..0000000 --- a/application/views/backend/chat.php +++ /dev/null @@ -1,112 +0,0 @@ -
    - -
    - - -

    - - - - Chat - -

    - - - - - - - - - - -
    - - -
    - -
    - - - - - -
    - -
      -
    - -
    - -
    - -
    - -
    - - - -
      -
    • - Art Ramadani -

      Are you here?

      - 09:00 -
      • - -
    • - Catherine J. Watkins -

      This message is pre-queued.

      - 09:25 -
      • - -
    • - Catherine J. Watkins -

      Whohoo!

      - 09:26 -
      • - -
    • - Catherine J. Watkins -

      Do you like it?

      - 09:27 -
      • -
    - - - - - -
      -
    • - Daniel A. Pena -

      I am going out.

      - 08:21 -
      • - -
    • - Daniel A. Pena -

      Call me when you see this message.

      - 08:27 -
      • -
    \ No newline at end of file From afa1c29c524f1dd4ffdeba5b690c3421e8c36c65 Mon Sep 17 00:00:00 2001 From: mtmzakir Date: Mon, 27 Nov 2023 02:31:13 +0530 Subject: [PATCH 10/24] Admin Update4 --- application/views/backend/.DS_Store | Bin 6148 -> 6148 bytes .../views/backend/admin/manage_language.php | 165 ------------------ application/views/backend/teacher/.DS_Store | Bin 0 -> 6148 bytes 3 files changed, 165 deletions(-) delete mode 100644 application/views/backend/admin/manage_language.php create mode 100644 application/views/backend/teacher/.DS_Store diff --git a/application/views/backend/.DS_Store b/application/views/backend/.DS_Store index 4eab0c768320391fed304dd5eca14412beba3648..29e88cdda53e6b57ddc74e1596e7750a0ad31c77 100644 GIT binary patch delta 91 zcmZoMXfc@J&&|%jz`)4BAi%(ow=rftvmgTlNQ9Lkks*a4mm!lOZ!#Zi1Bao7k&c3~ ixxwUVtoGtal4Zd~c{%xc=^#Tk^RVzUZ)WHC%MSn{X%hSZ delta 39 vcmZoMXfc@J&&$fdz`)4BAi%(o$565{YCSU}>*gOU{LB*@-fU*)_{$FfvRw+C diff --git a/application/views/backend/admin/manage_language.php b/application/views/backend/admin/manage_language.php deleted file mode 100644 index a7db87f..0000000 --- a/application/views/backend/admin/manage_language.php +++ /dev/null @@ -1,165 +0,0 @@ -
    -
    - - - - - - -
    - - -
    -
    - - -
    - 'phrase_form')); - $count = 1; - $language_phrases = $this->db->query("SELECT `phrase_id` , `phrase` , `$current_editing_language` FROM `language`")->result_array(); - foreach($language_phrases as $row) - { - $count++; - $phrase_id = $row['phrase_id']; //id number of phrase - $phrase = $row['phrase']; //basic phrase text - $phrase_language = $row[$current_editing_language]; //phrase of current editing language - ?> - -
    -
    -
    - - -

    -

    - -

    -
    - -
    - - -
    - - - - -
    -
    - - - -
    - - - - - - - - - - - db->list_fields('language'); - foreach($fields as $field) - { - if($field == 'phrase_id' || $field == 'phrase')continue; - ?> - - - - - - -
    - - - - - - -
    -
    - - - - -
    -
    - 'form-horizontal form-groups-bordered validate'));?> -
    -
    - -
    - -
    -
    - -
    -
    -
    - -
    -
    - -
    -
    - - - -
    -
    - 'form-horizontal form-groups-bordered validate'));?> -
    -
    - -
    - -
    -
    - -
    -
    -
    - -
    -
    - -
    -
    - - -
    -
    -
    \ No newline at end of file diff --git a/application/views/backend/teacher/.DS_Store b/application/views/backend/teacher/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 GIT binary patch literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0 Date: Mon, 27 Nov 2023 02:36:26 +0530 Subject: [PATCH 11/24] Removed Language Error --- application/controllers/Admin.php | 4 ---- application/helpers/multi_language_helper.php | 17 ----------------- .../views/backend/admin/system_settings.php | 19 +------------------ 3 files changed, 1 insertion(+), 39 deletions(-) diff --git a/application/controllers/Admin.php b/application/controllers/Admin.php index f5273a1..218571e 100644 --- a/application/controllers/Admin.php +++ b/application/controllers/Admin.php @@ -862,10 +862,6 @@ function system_settings($param1 = '', $param2 = '', $param3 = '') $this->db->where('type' , 'system_name'); $this->db->update('settings' , $data); - $data['description'] = $this->input->post('language'); - $this->db->where('type' , 'language'); - $this->db->update('settings' , $data); - $data['description'] = $this->input->post('text_align'); $this->db->where('type' , 'text_align'); $this->db->update('settings' , $data); diff --git a/application/helpers/multi_language_helper.php b/application/helpers/multi_language_helper.php index 41f5bdf..85d4147 100644 --- a/application/helpers/multi_language_helper.php +++ b/application/helpers/multi_language_helper.php @@ -25,23 +25,6 @@ function get_phrase($phrase = '') { $current_language = 'english'; $CI->session->set_userdata('current_language' , $current_language); } - - - /** insert blank phrases initially and populating the language db ***/ - $check_phrase = $CI->db->get_where('language' , array('phrase' => $phrase))->row()->phrase; - if ( $check_phrase != $phrase) - $CI->db->insert('language' , array('phrase' => $phrase)); - - - // query for finding the phrase from `language` table - $query = $CI->db->get_where('language' , array('phrase' => $phrase)); - $row = $query->row(); - - // return the current sessioned language field of according phrase, else return uppercase spaced word - if (isset($row->$current_language) && $row->$current_language !="") - return $row->$current_language; - else - return ucwords(str_replace('_',' ',$phrase)); } } diff --git a/application/views/backend/admin/system_settings.php b/application/views/backend/admin/system_settings.php index c2b826b..ce07853 100644 --- a/application/views/backend/admin/system_settings.php +++ b/application/views/backend/admin/system_settings.php @@ -52,24 +52,7 @@ -
    - -
    - -
    -
    + From bad18280218024008638f173b2041719578adb4b Mon Sep 17 00:00:00 2001 From: mtmzakir Date: Mon, 27 Nov 2023 03:43:51 +0530 Subject: [PATCH 12/24] Admin Update5 --- .../views/backend/admin/navigation.php | 39 +- .../views/backend/admin/system_settings.php | 4 +- application/views/backend/login.php | 4 +- assets/css/skins/cafe.css | 541 ------------------ assets/css/skins/green.css | 541 ------------------ assets/css/skins/purple.css | 541 ------------------ assets/css/skins/red.css | 541 ------------------ assets/css/skins/white.css | 409 ------------- assets/css/skins/yellow.css | 541 ------------------ assets/images/.DS_Store | Bin 6148 -> 6148 bytes assets/images/skins/cafe.png | Bin 278476 -> 0 bytes assets/images/skins/green.png | Bin 280136 -> 0 bytes assets/images/skins/purple.png | Bin 278009 -> 0 bytes assets/images/skins/red.png | Bin 282381 -> 0 bytes assets/images/skins/white.png | Bin 261030 -> 0 bytes assets/images/skins/yellow.png | Bin 274274 -> 0 bytes 16 files changed, 24 insertions(+), 3137 deletions(-) delete mode 100644 assets/css/skins/cafe.css delete mode 100644 assets/css/skins/green.css delete mode 100644 assets/css/skins/purple.css delete mode 100644 assets/css/skins/red.css delete mode 100644 assets/css/skins/white.css delete mode 100644 assets/css/skins/yellow.css delete mode 100644 assets/images/skins/cafe.png delete mode 100644 assets/images/skins/green.png delete mode 100644 assets/images/skins/purple.png delete mode 100644 assets/images/skins/red.png delete mode 100644 assets/images/skins/white.png delete mode 100644 assets/images/skins/yellow.png diff --git a/application/views/backend/admin/navigation.php b/application/views/backend/admin/navigation.php index ad0fcca..232edbf 100644 --- a/application/views/backend/admin/navigation.php +++ b/application/views/backend/admin/navigation.php @@ -32,7 +32,7 @@
  • - +
    • @@ -40,7 +40,7 @@
  • - +
    • @@ -52,18 +52,18 @@ echo 'opened active'; ?> "> - + @@ -72,7 +72,7 @@
  • - +