From 3bd7d59d79a6ca09d1142a87ac9bd87d1ad5b9e8 Mon Sep 17 00:00:00 2001
From: "de@itstall.de" <de@itstall.de>
Date: Sun, 4 Mar 2018 19:40:05 +0100
Subject: [PATCH] Added clubs, reports edited some other stuff
---
application/controllers/admin/Dashboard.php | 1 +
application/controllers/admin/Guests.php | 33 ++++++
application/controllers/admin/Members.php | 30 +++---
application/controllers/admin/Reports.php | 23 ++++
application/models/admin/Dashboard_model.php | 3 +
application/models/admin/Guests_model.php | 20 +++-
application/models/admin/Members_model.php | 7 +-
application/models/admin/Reports_model.php | 18 ++++
application/views/admin/dashboard/index.php | 9 ++
application/views/admin/guests/guests_add.php | 102 ++++++++++++++++++
.../views/admin/guests/guests_clubs_edit.php | 83 ++++++++++++++
.../views/admin/guests/guests_clubs_list.php | 67 ++++++++++++
.../views/admin/guests/guests_list.php | 4 +
application/views/admin/include/sidebar.php | 44 +++++---
application/views/admin/keys/keys_add.php | 6 +-
application/views/admin/keys/keys_list.php | 4 +
.../views/admin/members/member_add.php | 4 +
.../views/admin/members/member_list.php | 2 +-
application/views/admin/reports/birthdays.php | 43 ++++++++
application/views/admin/users/user_list.php | 2 +-
20 files changed, 473 insertions(+), 32 deletions(-)
create mode 100644 application/controllers/admin/Reports.php
create mode 100644 application/models/admin/Reports_model.php
create mode 100644 application/views/admin/guests/guests_add.php
create mode 100644 application/views/admin/guests/guests_clubs_edit.php
create mode 100644 application/views/admin/guests/guests_clubs_list.php
create mode 100644 application/views/admin/reports/birthdays.php
diff --git a/application/controllers/admin/Dashboard.php b/application/controllers/admin/Dashboard.php
index 5e7e710..45da0fe 100644
--- a/application/controllers/admin/Dashboard.php
+++ b/application/controllers/admin/Dashboard.php
@@ -12,6 +12,7 @@
$data['guests_count'] = $this->dashboard_model->get_guests_count();
$data['keys_count'] = $this->dashboard_model->get_keys_count();
$data['member_types'] = $this->dashboard_model->get_member_types();
+ $data['clubs_count'] = $this->dashboard_model->get_clubs_count();
$data['view'] = 'admin/dashboard/index';
$this->load->view('admin/layout', $data);
}
diff --git a/application/controllers/admin/Guests.php b/application/controllers/admin/Guests.php
index 3ac2928..f39f7c5 100644
--- a/application/controllers/admin/Guests.php
+++ b/application/controllers/admin/Guests.php
@@ -45,5 +45,38 @@
$this->load->view('admin/layout', $data);
}
}
+ public function clubs_list() {
+ $data['clubs'] = $this->guests_model->get_clubs();
+ $data['title'] = 'Vereins Liste';
+ $data['view'] = 'admin/guests/guests_clubs_list';
+ $this->load->view('admin/layout', $data);
+ }
+ public function clubs_edit($id = 0) {
+ if($this->input->post('submit')) {
+ $data = array(
+ 'name' => $this->input->post('name'),
+ 'street' => $this->input->post('street'),
+ 'zip' => $this->input->post('zip'),
+ 'town' => $this->input->post('town'),
+ 'phone' => $this->input->post('phone'),
+ 'email' => $this->input->post('email'),
+ 'executive_firstname' => $this->input->post('executive_firstname'),
+ 'executive_lastname' => $this->input->post('executive_lastname'),
+ );
+ $data = $this->security->xss_clean($data);
+ $result = $this->guests_model->edit_club($data, $id);
+ if($result) {
+ $this->logging_model->history_write($this->session->userdata('admin_id'), 'edited', 'guests_club', $id);
+ $this->session->set_flashdata('msg', 'Verein erfolgreich bearbeitet!');
+ redirect(base_url('admin/guests/clubs_list/'));
+ }
+ }
+ else {
+ $data['club_data'] = $this->guests_model->get_club($id);
+ $data['title'] = 'Edit User';
+ $data['view'] = 'admin/guests/guests_clubs_edit';
+ $this->load->view('admin/layout', $data);
+ }
+ }
}
?>
\ No newline at end of file
diff --git a/application/controllers/admin/Members.php b/application/controllers/admin/Members.php
index de30986..1b543d3 100644
--- a/application/controllers/admin/Members.php
+++ b/application/controllers/admin/Members.php
@@ -10,18 +10,7 @@ class Members extends MY_Controller {
}
public function index() {
- $all_users = $this->members_model->get_all_users();
- foreach ($all_users as $user) {
- $data['all_users'][$user['id']] = $user;
- if($user['birthday'] != '0000-00-00') { $data['all_users'][$user['id']]['birthday'] = date_to_german($user['birthday']); } else { $data['all_users'][$user['id']]['birthday'] = ''; }
- if($user['joined'] != '0000-00-00') { $data['all_users'][$user['id']]['joined'] = date_to_german($user['joined']); } else { $data['all_users'][$user['id']]['joined'] = ''; }
- if($user['withdrawal'] != '0000-00-00') { $data['all_users'][$user['id']]['withdrawal'] = date_to_german($user['withdrawal']); } else { $data['all_users'][$user['id']]['withdrawal'] = ''; }
- if($user['knowledge_proof'] != '0000-00-00') { $data['all_users'][$user['id']]['knowledge_proof'] = date_to_german($user['knowledge_proof']); } else { $data['all_users'][$user['id']]['knowledge_proof'] = ''; }
- if($user['is_member']) { $data['all_users'][$user['id']]['is_member'] = 'Ja'; } else { $data['all_users'][$user['id']]['is_member'] = 'Nein'; }
- }
- $data['title'] = 'User List';
- $data['view'] = 'admin/members/member_list';
- $this->load->view('admin/layout', $data);
+ $this->list_member('1');
}
public function view($id, $mode=false) {
@@ -37,6 +26,23 @@ class Members extends MY_Controller {
$data['view'] = 'admin/members/member_view';
$this->load->view('admin/layout', $data);
}
+ public function list_member($status) {
+ $all_users = $this->members_model->get_all_users($status);
+ foreach ($all_users as $user) {
+ $data['all_users'][$user['id']] = $user;
+ if($user['birthday'] != '0000-00-00') { $data['all_users'][$user['id']]['birthday'] = date_to_german($user['birthday']); } else { $data['all_users'][$user['id']]['birthday'] = ''; }
+ if($user['joined'] != '0000-00-00') { $data['all_users'][$user['id']]['joined'] = date_to_german($user['joined']); } else { $data['all_users'][$user['id']]['joined'] = ''; }
+ if($user['withdrawal'] != '0000-00-00') { $data['all_users'][$user['id']]['withdrawal'] = date_to_german($user['withdrawal']); } else { $data['all_users'][$user['id']]['withdrawal'] = ''; }
+ if($user['knowledge_proof'] != '0000-00-00') { $data['all_users'][$user['id']]['knowledge_proof'] = date_to_german($user['knowledge_proof']); } else { $data['all_users'][$user['id']]['knowledge_proof'] = ''; }
+ if($user['is_member']) { $data['all_users'][$user['id']]['is_member'] = 'Ja'; } else { $data['all_users'][$user['id']]['is_member'] = 'Nein'; }
+ }
+ if($status == 1) { $data['menu_class'] = 'member'; }
+ elseif($status == 4) { $data['menu_class'] = 'withdrawl'; }
+ elseif($status == 5) { $data['menu_class'] = 'died'; }
+ $data['title'] = 'User List';
+ $data['view'] = 'admin/members/member_list';
+ $this->load->view('admin/layout', $data);
+ }
public function add() {
if($this->input->post('submit')) {
diff --git a/application/controllers/admin/Reports.php b/application/controllers/admin/Reports.php
new file mode 100644
index 0000000..1158ae0
--- /dev/null
+++ b/application/controllers/admin/Reports.php
@@ -0,0 +1,23 @@
+<?php
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+class Reports extends MY_Controller {
+
+ public function __construct(){
+ parent::__construct();
+ $this->load->model('admin/reports_model', 'reports_model');
+ }
+ public function index() {
+ $this->list_member('1');
+ }
+ public function birthdays() {
+ $birthdays = $this->reports_model->get_birthdays();
+ foreach ($birthdays as $row) {
+ $data['birthdays'][$row['month']][] = $row;
+ }
+ $data['title'] = 'Geburtstage';
+ $data['view'] = 'admin/reports/birthdays';
+ $this->load->view('admin/layout', $data);
+ }
+}
+?>
\ No newline at end of file
diff --git a/application/models/admin/Dashboard_model.php b/application/models/admin/Dashboard_model.php
index 7990735..a1dc37a 100644
--- a/application/models/admin/Dashboard_model.php
+++ b/application/models/admin/Dashboard_model.php
@@ -31,5 +31,8 @@
public function get_keys_count() {
return $this->db->count_all('club_keys');
}
+ public function get_clubs_count() {
+ return $this->db->count_all('clubs');
+ }
}
?>
\ No newline at end of file
diff --git a/application/models/admin/Guests_model.php b/application/models/admin/Guests_model.php
index 6b5ad1b..13dc195 100644
--- a/application/models/admin/Guests_model.php
+++ b/application/models/admin/Guests_model.php
@@ -2,12 +2,30 @@
class Guests_model extends CI_Model {
public function get_all_guests() {
- $query = $this->db->get('guests');
+ $this->db->select('guests.*, clubs.name AS club');
+ $this->db->from('guests');
+ $this->db->join('clubs', 'guests.club=clubs.id');
+ $query = $this->db->get();
return $result = $query->result_array();
}
public function guest_add($data){
$this->db->insert('guests', $data);
return true;
}
+ public function get_clubs() {
+ $query = $this->db->get('clubs');
+ return $result = $query->result_array();
+ }
+ public function get_club($id) {
+ $this->db->from('clubs');
+ $this->db->where('id', $id);
+ $query = $this->db->get();
+ return $result = $query->row_array();
+ }
+ public function edit_club($data, $id) {
+ $this->db->where('id', $id);
+ $this->db->update('clubs', $data);
+ return $id;
+ }
}
?>
\ No newline at end of file
diff --git a/application/models/admin/Members_model.php b/application/models/admin/Members_model.php
index 53dbbc5..5d7f8ac 100644
--- a/application/models/admin/Members_model.php
+++ b/application/models/admin/Members_model.php
@@ -6,12 +6,17 @@
$result = $query->row_array();
return $result['id'];
}
- public function get_all_users() {
+ public function get_all_users($status=null) {
$this->db->select('members.*, member_types.member_type_name, member_types.is_member');
$this->db->from('members');
$this->db->join('member_types', 'member_types.id=members.member_type_id');
$this->db->join('insurance_types', 'insurance_types.id=members.insurance_type_id');
$this->db->order_by('members.lastname, members.firstname', 'ASC');
+ if($status == 1) {
+ $this->db->where('member_types.is_member', '1');
+ } elseif($status) {
+ $this->db->where('members.member_type_id', $status);
+ }
$query = $this->db->get();
return $result = $query->result_array();
}
diff --git a/application/models/admin/Reports_model.php b/application/models/admin/Reports_model.php
new file mode 100644
index 0000000..eb9a610
--- /dev/null
+++ b/application/models/admin/Reports_model.php
@@ -0,0 +1,18 @@
+<?php
+class Reports_model extends CI_Model {
+ public function get_birthdays() {
+ $sql = "SELECT members.id, members.firstname, members.lastname, DAY(members.birthday) AS day, MONTH(members.birthday) AS month, (YEAR(CURRENT_DATE) - YEAR(members.birthday)) - (RIGHT(CURRENT_DATE,5) < RIGHT(members.birthday, 5)) AS age
+ FROM members
+ JOIN member_types ON (member_types.id=members.member_type_id)
+ WHERE member_types.is_member = 1
+ ORDER BY age DESC, month ASC, day ASC";
+ $this->db->select('members.id, members.firstname, members.lastname, members.birthday, DAY(members.birthday) AS day, MONTH(members.birthday) AS month, (YEAR(CURRENT_DATE) - YEAR(members.birthday)) - (RIGHT(CURRENT_DATE,5) < RIGHT(members.birthday, 5)) AS age');
+ $this->db->from('members');
+ $this->db->join('member_types', 'member_types.id=members.member_type_id');
+ $this->db->where('member_types.is_member', '1');
+ $this->db->order_by('month ASC, day ASC');
+ $query = $this->db->get();
+ return $result = $query->result_array();
+ }
+}
+?>
\ No newline at end of file
diff --git a/application/views/admin/dashboard/index.php b/application/views/admin/dashboard/index.php
index d023e4a..4af983c 100644
--- a/application/views/admin/dashboard/index.php
+++ b/application/views/admin/dashboard/index.php
@@ -27,6 +27,15 @@
</div>
</div>
</div>
+ <div class="col-md-3 col-sm-6 col-xs-12">
+ <div class="info-box">
+ <span class="info-box-icon bg-green"><i class="fa fa-map-marker"></i></span>
+ <div class="info-box-content">
+ <span class="info-box-text">Vereine</span>
+ <span class="info-box-number"><?= $clubs_count; ?></span>
+ </div>
+ </div>
+ </div>
</div>
<div class="row">
<div class="col-md-4 col-sm-4 col-xs-10">
diff --git a/application/views/admin/guests/guests_add.php b/application/views/admin/guests/guests_add.php
new file mode 100644
index 0000000..789c836
--- /dev/null
+++ b/application/views/admin/guests/guests_add.php
@@ -0,0 +1,102 @@
+<link rel="stylesheet" href="<?= base_url() ?>public/plugins/bootstrap-datepicker/css/datepicker.css">
+<link rel="stylesheet" href="<?= base_url() ?>public/plugins/iCheck/square/_all.css">
+
+<section class="content">
+ <div class="row">
+ <div class="col-md-12">
+ <div class="box box-body with-border">
+ <div class="col-md-6">
+ <h4><i class="fa fa-plus"></i> Gastpilot hinzufügen</h4>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-md-12">
+ <div class="box border-top-solid">
+ <div class="box-body my-form-body">
+ <?php echo form_open(base_url('admin/guests/add'), 'class="form-horizontal"'); ?>
+ <div class="form-group">
+ <label for="firstname" class="col-sm-2 control-label">Vorname</label>
+ <div class="col-sm-9">
+ <input type="text" name="firstname" class="form-control" id="firstname" placeholder="" maxlength="50">
+ </div>
+ </div>
+ <div class="form-group">
+ <label for="lastname" class="col-sm-2 control-label">Nachname</label>
+ <div class="col-sm-9">
+ <input type="text" name="lastname" class="form-control" id="lastname" placeholder="" maxlength="50">
+ </div>
+ </div>
+ <div class="form-group">
+ <label for="street" class="col-sm-2 control-label">Straße</label>
+ <div class="col-sm-9">
+ <input type="text" name="street" class="form-control" id="street" placeholder="" maxlength="50">
+ </div>
+ </div>
+ <div class="form-group">
+ <label for="zip" class="col-sm-2 control-label">Postleitzahl</label>
+ <div class="col-sm-9">
+ <input type="text" name="zip" class="form-control" id="zip" placeholder="" maxlength="10">
+ </div>
+ </div>
+ <div class="form-group">
+ <label for="town" class="col-sm-2 control-label">Ort</label>
+ <div class="col-sm-9">
+ <input type="text" name="town" class="form-control" id="town" placeholder="" maxlength="50">
+ </div>
+ </div>
+ <div class="form-group">
+ <label for="birthday" class="col-sm-2 control-label">Geburtstag</label>
+ <div class="col-sm-9">
+ <div class="input-group date">
+ <div class="input-group-addon"><i class="fa fa-calendar"></i></div>
+ <input type="text" class="form-control pull-right datepicker" id="datepicker" name="birthday" data-provide="datepicker" data-date-format="dd.mm.yyyy">
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <label for="phone" class="col-sm-2 control-label">Telefon</label>
+ <div class="col-sm-9">
+ <input type="text" name="phone" class="form-control" id="phone" placeholder="" maxlength="50">
+ </div>
+ </div>
+ <div class="form-group">
+ <label for="email" class="col-sm-2 control-label">eMail</label>
+ <div class="col-sm-9">
+ <input type="text" name="email" class="form-control" id="email" placeholder="" maxlength="50">
+ </div>
+ </div>
+ <div class="form-group">
+ <label for="club" class="col-sm-2 control-label">Verein</label>
+ <div class="col-sm-9">
+ <input type="text" name="club" class="form-control" id="club" placeholder="" maxlength="50">
+ </div>
+ </div>
+ <div class="form-group">
+ <label for="insurance_number" class="col-sm-2 control-label">Versicherungs Nummer</label>
+ <div class="col-sm-9">
+ <input type="text" name="insurance_number" class="form-control" id="insurance_number" placeholder="" maxlength="50">
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-md-11">
+ <input type="submit" name="submit" value="Gastpilot hinzufügen" class="btn btn-info pull-right">
+ </div>
+ </div>
+ <?php echo form_close( ); ?>
+ </div>
+ </div>
+ </div>
+ </div>
+</section>
+
+<script src="<?= base_url() ?>public/plugins/datepicker/bootstrap-datepicker.js"></script>
+<script src="<?= base_url() ?>public/plugins/iCheck/icheck.js"></script>
+<script>
+ $('#datepicker').datepicker({})
+</script>
+
+<script>
+ $("#guests_add").addClass('active');
+</script>
\ No newline at end of file
diff --git a/application/views/admin/guests/guests_clubs_edit.php b/application/views/admin/guests/guests_clubs_edit.php
new file mode 100644
index 0000000..76e2b91
--- /dev/null
+++ b/application/views/admin/guests/guests_clubs_edit.php
@@ -0,0 +1,83 @@
+<link rel="stylesheet" href="<?= base_url() ?>public/plugins/bootstrap-datepicker/css/datepicker.css">
+<link rel="stylesheet" href="<?= base_url() ?>public/plugins/iCheck/square/_all.css">
+
+<section class="content">
+ <div class="row">
+ <div class="col-md-12">
+ <div class="box box-body with-border">
+ <div class="col-md-6">
+ <h4><i class="fa fa-plus"></i> Verein bearbeiten</h4>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-md-12">
+ <div class="box border-top-solid">
+ <div class="box-body my-form-body">
+ <?php echo form_open(base_url('admin/guests/clubs_edit/'.$club_data['id']), 'class="form-horizontal"' )?>
+ <div class="form-group">
+ <label for="lastname" class="col-sm-2 control-label">Name</label>
+ <div class="col-sm-9">
+ <input type="text" name="name" class="form-control" id="name" placeholder="" value="<?= $club_data['name'];?>" maxlength="50">
+ </div>
+ </div>
+ <div class="form-group">
+ <label for="street" class="col-sm-2 control-label">Straße</label>
+ <div class="col-sm-9">
+ <input type="text" name="street" class="form-control" id="street" placeholder="" value="<?= $club_data['street'];?>" maxlength="50">
+ </div>
+ </div>
+ <div class="form-group">
+ <label for="zip" class="col-sm-2 control-label">Postleitzahl</label>
+ <div class="col-sm-9">
+ <input type="text" name="zip" class="form-control" id="zip" placeholder="" value="<?= $club_data['zip'];?>" maxlength="10">
+ </div>
+ </div>
+ <div class="form-group">
+ <label for="town" class="col-sm-2 control-label">Ort</label>
+ <div class="col-sm-9">
+ <input type="text" name="town" class="form-control" id="town" placeholder="" value="<?= $club_data['town'];?>" maxlength="50">
+ </div>
+ </div>
+ <div class="form-group">
+ <label for="town" class="col-sm-2 control-label">Telefon</label>
+ <div class="col-sm-9">
+ <input type="text" name="phone" class="form-control" id="phone" placeholder="" value="<?= $club_data['phone'];?>" maxlength="50">
+ </div>
+ </div>
+ <div class="form-group">
+ <label for="town" class="col-sm-2 control-label">eMail</label>
+ <div class="col-sm-9">
+ <input type="text" name="email" class="form-control" id="email" placeholder="" value="<?= $club_data['email'];?>" maxlength="50">
+ </div>
+ </div>
+ <div class="form-group">
+ <label for="town" class="col-sm-2 control-label">Vorstand Vorname</label>
+ <div class="col-sm-9">
+ <input type="text" name="executive_firstname" class="form-control" id="executive_firstname" placeholder="" value="<?= $club_data['executive_firstname'];?>" maxlength="50">
+ </div>
+ </div>
+ <div class="form-group">
+ <label for="town" class="col-sm-2 control-label">Vorstand Nachname</label>
+ <div class="col-sm-9">
+ <input type="text" name="executive_lastname" class="form-control" id="executive_lastname" placeholder="" value="<?= $club_data['executive_lastname'];?>" maxlength="50">
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-md-11">
+ <input type="submit" name="submit" value="Speichern" class="btn btn-info pull-right">
+ </div>
+ </div>
+ <?php echo form_close( ); ?>
+ </div>
+ </div>
+ </div>
+ </div>
+</section>
+
+<script src="<?= base_url() ?>public/plugins/datepicker/bootstrap-datepicker.js"></script>
+<script src="<?= base_url() ?>public/plugins/iCheck/icheck.js"></script>
+<script>
+ $('#datepicker').datepicker({})
+</script>
diff --git a/application/views/admin/guests/guests_clubs_list.php b/application/views/admin/guests/guests_clubs_list.php
new file mode 100644
index 0000000..4bce5e2
--- /dev/null
+++ b/application/views/admin/guests/guests_clubs_list.php
@@ -0,0 +1,67 @@
+<link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/r/bs/jszip-2.5.0,pdfmake-0.1.18,dt-1.10.9,b-1.0.3,b-html5-1.0.3,b-print-1.0.3/datatables.min.css" />
+
+<section class="content">
+ <div class="row">
+ <div class="col-md-12">
+ <div class="box box-body">
+ <div class="col-md-6">
+ <h4><i class="fa fa-address-book"></i> Vereinsliste</h4>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="box border-top-solid">
+ <div class="box-body table-responsive">
+ <table id="example1" class="table table-bordered table-striped ">
+ <thead>
+ <tr>
+ <th>Name</th>
+ <th>Straße</th>
+ <th>PLZ</th>
+ <th>Ort</th>
+ <th>Telefon</th>
+ <th>Email</th>
+ <th>Vorstand</th>
+ <th>Optionen</th>
+ </tr>
+ </thead>
+ <tbody>
+ <?php foreach($clubs as $row): ?>
+ <tr>
+ <td><?= $row['name']; ?></td>
+ <td><?= $row['street']; ?></td>
+ <td><?= $row['zip']; ?></td>
+ <td><?= $row['town']; ?></td>
+ <td><?= $row['phone']; ?></td>
+ <td><?= $row['email']; ?></td>
+ <td><?= $row['executive_firstname'].' '.$row['executive_lastname']; ?></td>
+ <td class="text-right">
+ <a href="<?= base_url('admin/guests/clubs_edit/'.$row['id']); ?>" class="btn btn-danger btn-flat btn-xs"><i class="fa fa-edit"></i></a>
+ </td>
+ </tr>
+ <?php endforeach; ?>
+ </tbody>
+ </table>
+ </div>
+ </div>
+</section>
+
+<script src="<?= base_url() ?>public/plugins/datatables/jquery.dataTables.min.js"></script>
+<script src="<?= base_url() ?>public/plugins/datatables/dataTables.bootstrap.min.js"></script>
+<script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.8.4/moment.min.js"></script>
+<script src="//cdn.datatables.net/plug-ins/1.10.16/sorting/datetime-moment.js"></script>
+
+<script>
+ $(function () {
+ $.fn.dataTable.moment( 'DD.MM.YYYY' );
+ $("#example1").DataTable({
+ "language": {
+ "url": "//cdn.datatables.net/plug-ins/9dcbecd42ad/i18n/German.json"
+ }
+ });
+ });
+</script>
+
+<script>
+ $("#guests_clubs_list").addClass('active');
+</script>
\ No newline at end of file
diff --git a/application/views/admin/guests/guests_list.php b/application/views/admin/guests/guests_list.php
index 6bb82e2..68c4895 100644
--- a/application/views/admin/guests/guests_list.php
+++ b/application/views/admin/guests/guests_list.php
@@ -59,3 +59,7 @@
});
});
</script>
+
+<script>
+ $("#guests_list").addClass('active');
+</script>
\ No newline at end of file
diff --git a/application/views/admin/include/sidebar.php b/application/views/admin/include/sidebar.php
index 2883cbc..7b10f38 100644
--- a/application/views/admin/include/sidebar.php
+++ b/application/views/admin/include/sidebar.php
@@ -26,32 +26,46 @@ $cur_tab = $this->uri->segment(2)==''?'dashboard': $this->uri->segment(2);
</span>
</a>
<ul class="treeview-menu">
- <li id="add_user"><a href="<?= base_url('admin/members/add'); ?>"><i class="fa fa-circle-o"></i> Mitglied hinzufügen</a></li>
- <li id="view_users" class=""><a href="<?= base_url('admin/members'); ?>"><i class="fa fa-circle-o"></i> Mitglieder anzeigen</a></li>
+ <li id="members_add"><a href="<?= base_url('admin/members/add'); ?>"><i class="fa fa-circle-o"></i> Mitglied hinzufügen</a></li>
+ <li id="view_members_member" class=""><a href="<?= base_url('admin/members/list_member/1'); ?>"><i class="fa fa-circle-o"></i> Mitglieder anzeigen</a></li>
+ <li id="view_members_withdrawl" class=""><a href="<?= base_url('admin/members/list_member/4'); ?>"><i class="fa fa-circle-o"></i> Ausgetretene Mitglieder</a></li>
+ <li id="view_members_died" class=""><a href="<?= base_url('admin/members/list_member/5'); ?>"><i class="fa fa-circle-o"></i> Verstorbene Mitglieder</a></li>
</ul>
</li>
- <li id="keys" class="treeview">
+ <li id="keys" class="treeview">
+ <a href="#">
+ <i class="fa fa-key"></i> <span>Schlüssel</span>
+ <span class="pull-right-container">
+ <i class="fa fa-angle-left pull-right"></i>
+ </span>
+ </a>
+ <ul class="treeview-menu">
+ <!--<li id="keys_add"><a href="<?= base_url('admin/keys/add'); ?>"><i class="fa fa-circle-o"></i> Schlüssel hinzufügen</a></li>-->
+ <li id="keys_list" class=""><a href="<?= base_url('admin/keys'); ?>"><i class="fa fa-circle-o"></i> Schlüssel anzeigen</a></li>
+ </ul>
+ </li>
+ <li id="guests" class="treeview">
<a href="#">
- <i class="fa fa-key"></i> <span>Schlüssel</span>
+ <i class="fa fa-address-book"></i> <span>Gäste</span>
<span class="pull-right-container">
- <i class="fa fa-angle-left pull-right"></i>
- </span>
+ <i class="fa fa-angle-left pull-right"></i>
+ </span>
</a>
<ul class="treeview-menu">
- <!--<li id="add_key"><a href="<?= base_url('admin/keys/add'); ?>"><i class="fa fa-circle-o"></i> Schlüssel hinzufügen</a></li>-->
- <li id="view_keys" class=""><a href="<?= base_url('admin/keys'); ?>"><i class="fa fa-circle-o"></i> Schlüssel anzeigen</a></li>
+ <li id="guests_add" class=""><a href="<?= base_url('admin/guests/add'); ?>"><i class="fa fa-circle-o"></i> Gast hinzufügen</a></li>
+ <li id="guests_list" class=""><a href="<?= base_url('admin/guests'); ?>"><i class="fa fa-address-book"></i> Gäste anzeigen</a></li>
+ <li id="guests_clubs_list" class=""><a href="<?= base_url('admin/guests/clubs_list'); ?>"><i class="fa fa-map-marker"></i> Vereine anzeigen</a></li>
</ul>
</li>
- <li id="guests" class="treeview">
+ <li id="reports" class="treeview">
<a href="#">
- <i class="fa fa-address-book"></i> <span>Gäste</span>
- <span class="pull-right-container">
- <i class="fa fa-angle-left pull-right"></i>
- </span>
+ <i class="fa fa-book"></i> <span>Listen</span>
+ <span class="pull-right-container">
+ <i class="fa fa-angle-left pull-right"></i>
+ </span>
</a>
<ul class="treeview-menu">
- <li id="view_keys" class=""><a href="<?= base_url('admin/guests/add'); ?>"><i class="fa fa-circle-o"></i> Gast hinzufügen</a></li>
- <li id="view_keys" class=""><a href="<?= base_url('admin/guests'); ?>"><i class="fa fa-circle-o"></i> Gäste anzeigen</a></li>
+ <li id="reports_birthdays" class=""><a href="<?= base_url('admin/reports/birthdays'); ?>"><i class="fa fa-birthday-cake"></i> Geburtstage</a></li>
</ul>
</li>
</section>
diff --git a/application/views/admin/keys/keys_add.php b/application/views/admin/keys/keys_add.php
index 3d8c313..63c8d3e 100644
--- a/application/views/admin/keys/keys_add.php
+++ b/application/views/admin/keys/keys_add.php
@@ -139,4 +139,8 @@
</div>
</div>
</div>
-</section>
\ No newline at end of file
+</section>
+
+<script>
+ $("#keys_add").addClass('active');
+</script>
\ No newline at end of file
diff --git a/application/views/admin/keys/keys_list.php b/application/views/admin/keys/keys_list.php
index 413beb9..0f3539c 100644
--- a/application/views/admin/keys/keys_list.php
+++ b/application/views/admin/keys/keys_list.php
@@ -100,4 +100,8 @@
modal.find('.modal-body select').val(memberid);
modal.find('.modal-body #keyid').val(keyid);
});
+</script>
+
+<script>
+ $("#keys_list").addClass('active');
</script>
\ No newline at end of file
diff --git a/application/views/admin/members/member_add.php b/application/views/admin/members/member_add.php
index df1cb64..6208b51 100644
--- a/application/views/admin/members/member_add.php
+++ b/application/views/admin/members/member_add.php
@@ -140,4 +140,8 @@
<script src="<?= base_url() ?>public/plugins/iCheck/icheck.js"></script>
<script>
$('#datepicker').datepicker({})
+</script>
+
+<script>
+ $("#members_add").addClass('active');
</script>
\ No newline at end of file
diff --git a/application/views/admin/members/member_list.php b/application/views/admin/members/member_list.php
index f9b1c4f..1d61f8e 100644
--- a/application/views/admin/members/member_list.php
+++ b/application/views/admin/members/member_list.php
@@ -105,5 +105,5 @@
</script>
<script>
- $("#view_users").addClass('active');
+ $("#view_members_<?= $menu_class?>").addClass('active');
</script>
\ No newline at end of file
diff --git a/application/views/admin/reports/birthdays.php b/application/views/admin/reports/birthdays.php
new file mode 100644
index 0000000..c5686cc
--- /dev/null
+++ b/application/views/admin/reports/birthdays.php
@@ -0,0 +1,43 @@
+<section class="content">
+ <div class="row">
+ <div class="col-md-12">
+ <div class="box box-body">
+ <div class="col-md-6">
+ <h4><i class="fas fa-birthday-cake"></i> Geburtstage</h4>
+ </div>
+ </div>
+ </div>
+ </div>
+ <table id="example1" class="table table-bordered table-striped ">
+ <?php
+ $key_old = 0;
+ foreach ($birthdays as $key => $value) { ?>
+ <?php
+ if($key != $key_old) {
+ $key_old = $key;
+ ?>
+ <tr>
+ <td><?= $key ?></td>
+ </tr>
+ <tr>
+ <th></th>
+ <th>Name</th>
+ <th>Geburtstag</th>
+ <th>Alter</th>
+ </tr>
+
+ <?php }
+ foreach ($value as $row) { ?>
+ <tr>
+ <td></td>
+ <td><?= $row['firstname'].' '.$row['lastname']; ?></td>
+ <td><?= date_to_german($row['birthday']); ?></td>
+ <td><?= $row['age']; ?></td>
+ </tr>
+ <?php } } ?>
+ </table>
+</section>
+
+<script>
+ $("#reports_birthdays").addClass('active');
+</script>
\ No newline at end of file
diff --git a/application/views/admin/users/user_list.php b/application/views/admin/users/user_list.php
index 0a8c3c0..b63a464 100644
--- a/application/views/admin/users/user_list.php
+++ b/application/views/admin/users/user_list.php
@@ -91,4 +91,4 @@
<script>
$("#view_users").addClass('active');
-</script>
+</script>
--
GitLab