Skip to content

Commit

Permalink
Updated admin committees module
Browse files Browse the repository at this point in the history
  • Loading branch information
@alkawamara
alkawamara committed Feb 27, 2017
1 parent ef39c00 commit e7f2c1c
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 17 deletions.
21 changes: 19 additions & 2 deletions admin/committees.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,23 @@
</div>

<div class="corporato fitted divider"></div>

<div class="two fields">
<div class="field">
<label>Committee Chairperson</label>
<label class="input"><i class="icon-append icon asterisk"></i>
<input type="text" name="chairperson" placeholder="Name of committee">
</label>
</div>

<div class="field">
<label>Committee Deputy Chairperson</label>
<label class="input"><i class="icon-append icon asterisk"></i>
<input type="text" name="deputy-chairperson" placeholder="Name of committee">
</label>
</div>

</div>

<button type="button" name="dosubmit" class="corporato button">Add Committee</button>
<a href="index.php?do=committees" class="corporato basic button">Return to list of committees</a>
Expand Down Expand Up @@ -166,8 +183,8 @@
<?php foreach ($committeesrow as $row):?>
<tr>
<td><?php echo $row->name;?></td>
<td><?php echo $row->committees_type;?></td>
<td><?php echo $row->created;?></td>
<td><?php echo $row->committees_name;?></td>
<td><?php echo Filter::dodate("short_date", $row->created);?></td>
<td class="push-right"><a href="index.php?do=committees&amp;action=edit&amp;id=<?php echo $row->id;?>"><i class="circular inverted success icon pencil link"></i></a> <a class="delete" data-title="Delete committee" data-option="deleteCommittee" data-id="<?php echo $row->id;?>" data-name="<?php echo $row->name;?>"><i class="circular danger inverted remove icon link"></i></a></td>
</tr>
<?php endforeach;?>
Expand Down
22 changes: 11 additions & 11 deletions admin/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,23 +32,23 @@

<nav>
<ul>
<li class="parent<?php if (!Filter::$do) echo ' active';?>"><a href="index.php"><i class="icon dashboard"></i> <span><?php echo Lang::$word->ADM_DASH;?></span></a></li>
<li class="parent <?php echo (Filter::$do == 'leaders') ? "active" : "normal";?>"><a href="index.php?do=leaders"><i class="icon user"></i> <span>Leaders</span></a></li>
<li class="parent <?php echo (Filter::$do == 'bills') ? "active" : "normal";?>"><a href="index.php?do=bills"><i class="icon user"></i> <span>Bills</span></a></li>
<li class="<?php if (!Filter::$do) echo ' active';?>"><a href="index.php"><i class="icon dashboard"></i> <span><?php echo Lang::$word->ADM_DASH;?></span></a></li>
<li class="<?php echo (Filter::$do == 'leaders') ? "active" : "normal";?>"><a href="index.php?do=leaders"><i class="icon user"></i> <span>Leaders</span></a></li>
<li class="<?php echo (Filter::$do == 'bills') ? "active" : "normal";?>"><a href="index.php?do=bills"><i class="icon user"></i> <span>Bills</span></a></li>

<li class="parent"><a class="<?php echo (Filter::$do == 'committees' or Filter::$do == 'committeestypes') ? "expanded" : "collapsed";?>"><i class="icon send"></i><span>Committees</span><i class="icon triangle down"></i></a>
<ul class="sublist<?php if (in_array(Filter::$do, array('committees','committeestypes'))) echo ' active';?>">
<li class="parent"><a class="<?php echo (Filter::$do == 'committees' or Filter::$do == 'committees-type') ? "expanded" : "collapsed";?>"><i class="icon send"></i><span>Committees</span><i class="icon triangle down"></i></a>
<ul class="sublist<?php if (in_array(Filter::$do, array('committees','committees-type'))) echo ' active';?>">
<li class="<?php echo (Filter::$do == 'committees') ? "active" : "normal";?>"><a href="index.php?do=committees"><i class="icon briefcase"></i> <span>Committees</span></a></li>
<li class="<?php echo (Filter::$do == 'committeestypes') ? "active" : "normal";?>"><a href="index.php?do=committees-type"><i class="icon briefcase"></i> <span>Committee Types</span></a></li>
<li class="<?php echo (Filter::$do == 'committees-type') ? "active" : "normal";?>"><a href="index.php?do=committees-type"><i class="icon briefcase"></i> <span>Committee Types</span></a></li>
</ul>
</li>

<li class="parent <?php echo (Filter::$do == 'parties') ? "active" : "normal";?>"><a href="index.php?do=parties"><i class="icon user"></i> <span>Parties</span></a></li>
<li class="parent <?php echo (Filter::$do == 'constituencies') ? "active" : "normal";?>"><a href="index.php?do=constituencies"><i class="icon user"></i> <span>Constituencies</span></a></li>
<li class="parent <?php echo (Filter::$do == 'calendar') ? "active" : "normal";?>"><a href="index.php?do=calendar"><i class="icon user"></i> <span>Calendar</span></a></li>
<li class="parent <?php echo (Filter::$do == 'users') ? "active" : "normal";?>"><a href="index.php?do=users"><i class="icon user"></i><span>Users</span></a></li>
<li class="<?php echo (Filter::$do == 'parties') ? "active" : "normal";?>"><a href="index.php?do=parties"><i class="icon user"></i> <span>Parties</span></a></li>
<li class="<?php echo (Filter::$do == 'constituencies') ? "active" : "normal";?>"><a href="index.php?do=constituencies"><i class="icon user"></i> <span>Constituencies</span></a></li>
<li class="<?php echo (Filter::$do == 'calendar') ? "active" : "normal";?>"><a href="index.php?do=calendar"><i class="icon user"></i> <span>Calendar</span></a></li>
<li class="<?php echo (Filter::$do == 'users') ? "active" : "normal";?>"><a href="index.php?do=users"><i class="icon user"></i><span>Users</span></a></li>
<li class="<?php echo (Filter::$do == 'pages') ? "active" : "normal";?>"><a href="index.php?do=pages"><i class="icon file text"></i> <span>Pages</span></a></li>
<li class="parent <?php echo (Filter::$do == 'config') ? "active" : "normal";?>"><a href="index.php?do=config"><i class="icon laptop"></i><span>Settings</span></a></li>
<li class="<?php echo (Filter::$do == 'config') ? "active" : "normal";?>"><a href="index.php?do=config"><i class="icon laptop"></i><span>Settings</span></a></li>
</ul>
</nav>

Expand Down
11 changes: 7 additions & 4 deletions lib/class_committees.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,9 @@ public function getCommittees($from = '')

} elseif(isset($_GET['letter'])) {
$letter = sanitize($_GET['letter'], 2);
$where = "WHERE name REGEXP '^" . self::$db->escape($letter) . "'";
$where = "WHERE c.name REGEXP '^" . self::$db->escape($letter) . "'";
$q = "SELECT COUNT(*) FROM " . self::cTable . " WHERE name REGEXP '^" . self::$db->escape($letter) . "' LIMIT 1";

} else {
$q = "SELECT COUNT(*) FROM " . self::cTable . " LIMIT 1";
$where = null;
Expand All @@ -96,8 +97,9 @@ public function getCommittees($from = '')
$pager->default_ipp = Registry::get("Core")->perpage;
$pager->paginate();

$sql = "SELECT c.*"
$sql = "SELECT c.*, ct.name as committees_name"
. "\n FROM " . self::cTable . " as c"
. "\n LEFT JOIN " . self::ctTable . " as ct ON ct.id = c.committees_type"
. "\n $where"
. "\n ORDER BY c.created DESC" . $pager->limit;

Expand Down Expand Up @@ -172,8 +174,9 @@ public function renderCommittee()
{
$is_admin = Registry::get("Users")->is_Admin();

$sql = "SELECT c.*, c.id as cid,"
. "\n FROM " . self::cTable . " as c"
$sql = "SELECT c.*, c.id as cid, ct.name as committees_name"
. "\n FROM " . self::cTable . " as c"
. "\n LEFT JOIN " . self::ctTable . " as ct ON ct.id = c.committees_type"
. "\n WHERE c.slug = '".$this->committeeslug."'"
. "\n $is_admin";
$row = self::$db->first($sql);
Expand Down

0 comments on commit e7f2c1c

Please sign in to comment.