Skip to content

Commit 855c789

Browse files
karsanrichardkarsanrichard
committed
Signed-off-by: karsanrichard <[email protected]>
1 parent aca0cfa commit 855c789

File tree

14 files changed

+156
-53
lines changed

14 files changed

+156
-53
lines changed

‎application/config/database.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
$db['default']['hostname'] = 'localhost';
5151
$db['default']['username'] = 'root';
5252
$db['default']['password'] = '';
53-
$db['default']['database'] = 'hcmp';
53+
$db['default']['database'] = 'hcmp_rtk';
5454
$db['default']['dbdriver'] = 'mysql';
5555
$db['default']['dbprefix'] = '';
5656
$db['default']['pconnect'] = TRUE;

‎application/controllers/issues.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -375,6 +375,7 @@ public function external_issue()
375375
{
376376
//security check
377377
if($this->input->post('mfl')):
378+
$district_id = $this -> session -> userdata('district_id');
378379
$facility_code=$this -> session -> userdata('facility_id');
379380
$service_point=array_values($this->input->post('mfl'));
380381
$commodity_id=array_values($this->input->post('desc'));

‎application/controllers/reports.php‎

Lines changed: 44 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3091,6 +3091,43 @@ public function get_division_commodities_data($district_id = null, $facility_cod
30913091

30923092
}
30933093
public function consumption_data_dashboard() {
3094+
$from= strtotime(date('d-m-y'));
3095+
$to= strtotime(date('d-m-y'));
3096+
// $category_id=($category_id=="NULL") ? null :$category_id;
3097+
$county_id = $this -> session -> userdata('county_id');
3098+
$district_id = $this -> session -> userdata('district_id');
3099+
$facility_code = $this -> session -> userdata('facility_id');
3100+
3101+
$county_name = counties::get_county_name($county_id);
3102+
3103+
$category_data = $series_data = $graph_data= $series_data_=array();
3104+
//check if the district is set
3105+
$district_data = (isset($district_id) && ($district_id > 0)) ? districts::get_district_name($district_id) -> toArray() : null;
3106+
$district_name_ = (isset($district_data)) ? " :" . $district_data[0]['district'] . " subcounty" : null;
3107+
$option_new = isset($option) ? $option : "ksh";
3108+
// $facility_code_ = isset($facility_code) ? facilities::get_facility_name_($facility_code) -> toArray() : null;
3109+
// $facility_name=$facility_code_[0]['facility_name'];
3110+
$commodity_name=(isset($commodity_id))? Commodities::get_details($commodity_id)->toArray() : null;
3111+
$category_name_=@$commodity_name[0]['commodity_name'];
3112+
$commodity_name=isset($category_name_)? " for ".$category_name_ : null;
3113+
$title=isset($facility_code) && isset($district_id)? "$district_name_ : $facility_name" :(
3114+
$district_id>0 && !isset($facility_code) ? "$district_name_": "$county_name[county] county") ;
3115+
$time= "between ".date('j M y', $from)." and ".date('j M y', $to);
3116+
3117+
$consumption_data = Facility_stocks::get_county_consumption_level_new($facility_code,$district_id, $county_id,$category_id, $commodity_id, $option,$from, $to,$report_type);
3118+
3119+
$default_consumption_graph_ = array();
3120+
$graph_type='column';
3121+
$default_consumption_graph_=array_merge($default_consumption_graph_,array("graph_id"=>'graph_content_'));
3122+
$default_consumption_graph_=array_merge($default_consumption_graph_,array("graph_title"=>"Consumption level $commodity_name $title $time"));
3123+
$default_consumption_graph_=array_merge($default_consumption_graph_,array("graph_type"=>$graph_type));
3124+
$default_consumption_graph_=array_merge($default_consumption_graph_,array("graph_yaxis_title"=>"Commodity Consumption level in $option_new"));
3125+
$default_consumption_graph_=array_merge($default_consumption_graph_,array("graph_categories"=>$category_data ));
3126+
$default_consumption_graph_=array_merge($default_consumption_graph_,array("series_data"=>array('total'=>$series_data)));
3127+
$data = array();
3128+
3129+
$def_cons=$this->hcmp_functions->create_high_chart_graph($default_consumption_graph_);
3130+
$data['default_consumption_graph'] = $def_cons;
30943131

30953132
$county_id = $this -> session -> userdata('county_id');
30963133
$data['district_data'] = districts::getDistrict($county_id);
@@ -3099,8 +3136,9 @@ public function consumption_data_dashboard() {
30993136
$data['categories']=commodity_sub_category::get_all_pharm();
31003137
return $this -> load -> view("subcounty/ajax/county_consumption_data_filter_v", $data);
31013138
}
3139+
3140+
31023141
public function consumption_stats_graph($commodity_id = null,$category_id = null, $district_id = null, $facility_code=null, $option = null,$from=null,$to=null,$report_type=null) {
3103-
31043142
//reset the values here
31053143
$commodity_id=($commodity_id=="NULL") ? null :$commodity_id;
31063144
$district_id=($district_id=="NULL") ? null :$district_id;
@@ -3249,7 +3287,11 @@ public function monitoring(){
32493287
|--------------------------------------------------------------------------
32503288
*/
32513289
public function county_expiries() {
3290+
$county_id=$this -> session -> userdata('county_id');
3291+
$year = date('Y');
3292+
32523293
$county_id=$this -> session -> userdata('county_id');
3294+
$data['year'] = $year;
32533295
$data['title'] = "Expired Products";
32543296
$data['banner_text'] = "Expired Products";
32553297
$data['content_view'] = "facility/facility_reports/reports_v";
@@ -3272,6 +3314,7 @@ public function county_consumption() {
32723314
$this -> load -> view("shared_files/template/template", $data);
32733315
}
32743316
public function county_donation() {
3317+
$data['year'] = date('Y');
32753318
$county_id=$this -> session -> userdata('county_id');
32763319
$data['district_data'] = districts::getDistrict($county_id);
32773320
$data['title'] = $data['banner_text']="Donations";

‎application/controllers/user.php‎

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -697,6 +697,7 @@ public function addnew_user(){
697697
}
698698

699699
public function edit_user(){
700+
700701
$county = $this -> session -> userdata('county_id');
701702
$identifier = $this -> session -> userdata('user_indicator');
702703

@@ -708,8 +709,8 @@ public function edit_user(){
708709
$username_edit = $_POST['username_edit'];
709710
$user_type_edit_district = $_POST['user_type_edit_district'];
710711
$district_name_edit = $_POST['district_name_edit'];
711-
$email_recieve_edit = $_POST['email_edit_recieve'];
712-
$sms_recieve_edit = $_POST['sms_edit_recieve'];
712+
$email_recieve_edit = $_POST['email_recieve_edit'];
713+
$sms_recieve_edit = $_POST['sms_recieve_edit'];
713714

714715
$user_id= $_POST['user_id'];
715716
// echo $email_recieve_edit;exit;
@@ -722,6 +723,25 @@ public function edit_user(){
722723

723724
$status=0;
724725
}
726+
727+
if ($email_recieve_edit=="true") {
728+
729+
$email_recieve_edit=1;
730+
731+
} elseif($email_recieve_edit=="false") {
732+
733+
$email_recieve_edit=0;
734+
}
735+
736+
if ($sms_recieve_edit=="true") {
737+
738+
$sms_recieve_edit=1;
739+
740+
} elseif($sms_recieve_edit=="false") {
741+
742+
$sms_recieve_edit=0;
743+
}
744+
725745
if ($identifier=="district") {
726746

727747
$facility_id_edit = $_POST['facility_id_edit_district'];
@@ -733,9 +753,19 @@ public function edit_user(){
733753

734754

735755
//update user
756+
$q="UPDATE `user` SET fname ='$fname' ,lname ='$lname',email ='$email_edit',usertype_id =$user_type_edit_district,telephone ='$telephone_edit',
757+
district ='$district_name_edit',facility ='$facility_id_edit',status ='$status',county_id ='$county',
758+
email_recieve ='$email_recieve_edit',
759+
sms_recieve ='$sms_recieve_edit'
760+
WHERE `id`= '$user_id'";
761+
echo json_encode($q);
762+
exit;
763+
736764
$update_user = Doctrine_Manager::getInstance()->getCurrentConnection();
737765
$update_user->execute("UPDATE `user` SET fname ='$fname' ,lname ='$lname',email ='$email_edit',usertype_id =$user_type_edit_district,telephone ='$telephone_edit',
738-
district ='$district_name_edit',facility ='$facility_id_edit',status ='$status',county_id ='$county',email_recieve ='$email_recieve_edit',sms_recieve ='$sms_recieve_edit'
766+
district ='$district_name_edit',facility ='$facility_id_edit',status ='$status',county_id ='$county',
767+
email_recieve ='$email_recieve_edit',
768+
sms_recieve ='$sms_recieve_edit'
739769
WHERE `id`= '$user_id'");
740770

741771
}

‎application/models/facility_stocks.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,8 @@ public static function drug_store_commodity_expiries($district_id){
218218
219219
from drug_store_issues ds,commodities c
220220
221-
where ds.expiry_date <= NOW() AND district_id = '$district_id'
222-
and qty_issued>0 and c.id = ds.commodity_id
221+
where ds.expiry_date <= NOW() AND ds.district_id = '$district_id'
222+
and ds.qty_issued>0 and c.id = ds.commodity_id
223223
");
224224
return $stocks ;
225225
}
@@ -236,7 +236,7 @@ public static function drug_store_potential_expiries($district_id){
236236
from drug_store_issues ds,commodities c
237237
238238
where ds.expiry_date
239-
BETWEEN CURDATE()AND DATE_ADD(CURDATE(), INTERVAL 6 MONTH) AND district_id = '$district_id'
239+
BETWEEN CURDATE()AND DATE_ADD(CURDATE(), INTERVAL 6 MONTH) AND ds.district_id = '$district_id'
240240
and qty_issued>0 and c.id = ds.commodity_id
241241
");
242242
return $stocks ;
@@ -369,7 +369,7 @@ public static function potential_expiries($facility_code){
369369
return $stocks;
370370
}
371371
public static function potential_expiries_email($district_id=null,$facility_code=null){
372-
$and_data =($district_id>0) ?" AND d1.id = '$district_id'" : null;
372+
$and_data =($district_id>0) ?" AND d.id = '$district_id'" : null;
373373
$and_data .=($facility_code>0) ?" AND f.facility_code = '$facility_code'" : null;
374374
$query = Doctrine_Manager::getInstance()->getCurrentConnection()->fetchAll("
375375
select c.county, d1.district as subcounty ,temp.commodity_name,

‎application/models/users.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ public function setTableDefinition() {
1414
$this -> hasColumn('facility', 'varchar', 255);
1515
$this -> hasColumn('status', 'int', 11);
1616
$this -> hasColumn('county_id', 'int', 11);
17+
$this -> hasColumn('email_recieve', 'int', 1);
18+
$this -> hasColumn('sms_recieve', 'int', 1);
1719

1820
}
1921

‎application/views/Admin/user_listing_v.php‎

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
//for text and email receivals
105105
//<td style="display:none;" class="email_recieve"><'.$list['email_recieve'];'</td>
106106
//<td style="display:none;" class="sms_recieve"><'.$list['sms_recieve'];'</td>
107-
if ($list['email_recieve']==2):
107+
if ($list['email_recieve']==1):
108108
echo'
109109
<td><input class="email_recieve" data-attr="'.$list['email_recieve'].'" value="'.$list['email_recieve'].'" type="checkbox" disabled checked ="checked"></td>
110110
';
@@ -114,7 +114,7 @@
114114
';
115115
endif;
116116

117-
if ($list['sms_recieve']==2):
117+
if ($list['sms_recieve']==1):
118118
echo'
119119
<td ><input class="sms_recieve" data-attr="'.$list['sms_recieve'].'" value="'.$list['sms_recieve'].'" type="checkbox" disabled checked ="checked"></td>
120120
';
@@ -382,17 +382,31 @@
382382
<div class=" col-md-6">
383383
<label> Enable Email Recieval </label>
384384
<div class="form-group">
385-
Yes <input type="radio" data-attr = "2" name="email_recieve_edit_yes" id="email_recieve_edit_yes" required="required" readonly>
386-
No <input type="radio" data-attr = "1" name="email_recieve_edit_no" id="email_recieve_edit_no" required="required" readonly>
387-
<input type="hidden" name="email_recieve_selection" id="email_recieve_selection" class="email_recieve_selection">
385+
<input type="hidden" name="email_recieve_edit" value="0">
386+
<input type="checkbox" value= "1" name="email_recieve_edit" class="email_recieve_edit" id="email_recieve_edit" required="required" readonly>
387+
<?php
388+
if ($_POST['email_recieve_edit'] == '1'):
389+
echo '<input type="hidden" value = "1" name="email_recieve_selection" id="email_recieve_selection" class="email_recieve_selection">
390+
';elseif(!isset($_POST['email_recieve_edit'])):
391+
echo '<input type="hidden" value = "0" name="email_recieve_selection" id="email_recieve_selection" class="email_recieve_selection">
392+
';
393+
endif;
394+
?>
388395
</div>
389396
</div>
390397
<div class=" col-md-6">
391398
<label> Enable Text Recieval </label>
392399
<div class="form-group">
393-
Yes <input type="radio" data-attr = "2" name="sms_recieve_edit_yes" id="sms_recieve_edit_yes" required="required" readonly>
394-
No <input type="radio" data-attr = "1" name="sms_recieve_edit_no" id="sms_recieve_edit_no" required="required" readonly>
395-
<input type="hidden" name="sms_recieve_selection" id="sms_recieve_selection" class="sms_recieve_selection">
400+
<input type="hidden" name="sms_recieve_edit" value="0">
401+
<input type="checkbox" value="1" name="sms_recieve_edit" class="email_recieve_edit" id="sms_recieve_edit" required="required" readonly>
402+
<?php
403+
/*if ($_POST['sms_recieve_edit'] == '1'):
404+
echo '<input type="hidden" value = "1" name="sms_recieve_selection" id="sms_recieve_selection" class="sms_recieve_selection">
405+
';elseif(!isset($_POST['sms_recieve_edit'])):
406+
echo '<input type="hidden" value = "0" name="sms_recieve_selection" id="sms_recieve_selection" class="sms_recieve_selection">
407+
';
408+
endif;*/
409+
?>
396410
</div>
397411
</div>
398412
<div class="col-md-6">

‎application/views/Admin/users_v.php‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,6 @@ function ajax_post_process (url,div){
424424
$( '.err_edit' ).addClass( "alert-danger alert-dismissable" );
425425
$("#edit_user,#create_new").attr("disabled", "disabled");
426426
}else if(data.response=='true'){
427-
428427
$(".err_edit").empty();
429428
$(".err_edit").removeClass("alert-danger alert-dismissable");
430429
$( '.err_edit' ).addClass( "alert-success alert-dismissable" );
@@ -499,17 +498,20 @@ function ajax_post_process (url,div){
499498
function ajax_post (url,div){
500499
var url =url;
501500
var loading_icon="<?php echo base_url().'assets/img/Preloader_4.gif' ?>";
501+
502502
$.ajax({
503503
type: "POST",
504504
data:{ 'fname_edit': $('#fname_edit').val(),'lname_edit': $('#lname_edit').val(),'county_edit': $('#county_edit').val(),
505505
'telephone_edit': $('#telephone_edit').val(),'email_edit': $('#email_edit').val(),
506506
'username_edit': $('#username_edit').val(),'facility_id_edit_district': $('#edit_facility').val(),
507507
'user_type_edit_district': $('#user_type_edit_district').val(),'district_name_edit': $('#edit_district').val(),
508508
'facility_id_edit': $('#edit_facility').val(),'status': $('.onoffswitch-checkbox').prop('checked'),'user_id':$('#email_edit').attr('data-id'),
509-
'email_edit_recieve':$('#email_recieve_selection').val(),'sms_edit_recieve':$('#sms_recieve_selection').val()},
509+
'email_recieve_edit':$('#email_recieve_edit').prop('checked'),'sms_recieve_edit':$('#email_recieve_edit').prop('checked')
510+
},
510511
url: url,
511512
beforeSend: function() {
512513
//$(div).html("");
514+
// alert($('#email_recieve_edit').prop('checked'));return;
513515
var answer = confirm("Are you sure you want to proceed?");
514516
if (answer){
515517
$('.modal-body').html("<img style='margin:30% 0 20% 42%;' src="+loading_icon+">");
@@ -521,7 +523,8 @@ function ajax_post (url,div){
521523
},
522524
success: function(msg) {
523525
//success message
524-
526+
// $('.modal-body').html(msg);
527+
// return;
525528
setTimeout(function () {
526529
$('.modal-body').html("<div class='bg-warning' style='height:30px'>"+
527530
"<button type='button' class='close' data-dismiss='alert' aria-hidden='true'>×</button>"+

‎application/views/facility/facility_issues/facility_redistribute_items_v.php‎

Lines changed: 5 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?php echo "<pre>";print_r($commodities);echo "</pre>";exit; ?>
1+
<?php //echo "<pre>";print_r($commodities);echo "</pre>";exit; ?>
22
<style>
33
.big{ width: 150px !important; }
44
.row div p{
@@ -49,36 +49,14 @@
4949
</thead>
5050
<tbody>
5151
<tr row_id='0'>
52-
<<<<<<< HEAD
53-
=======
54-
<<<<<<< HEAD
55-
>>>>>>> 009c71465194e3d5f5df5d1d9e1da5d569082273
5652
<td>
5753
<select name="district[0]" class="form-control input-small district" style="width:110px !important;">
58-
<option value="0">Select Sub-county</option>
5954
<?php
60-
foreach ($subcounties as $district) {
61-
$id=$district->id;
62-
$name=$district->district;
63-
echo '<option value="'.$id.'"> '.$name.'</option>';
64-
}?>
65-
</select>
66-
</td>
67-
<td>
68-
<select name="mfl[0]" class="form-control input-small facility" style="width:110px !important;">
69-
<option value="0">Select Facility</option>
70-
<<<<<<< HEAD
71-
=======
72-
=======
73-
<td>
74-
<select name="district[0]" class="form-control input-small district">
75-
<?php
76-
7755
if (isset($donate_destination)&&($donate_destination == 'district')) {
7856
echo '<option value="'.$district_id.' "> '.$district_data['district'].'</option>';
7957
}
8058
else{
81-
echo '<option value="0">--select subcounty---</option>';
59+
echo '<option value="0">Select Sub-county</option>';
8260
foreach ($subcounties as $district) {
8361
$id=$district->id;
8462
$name=$district->district;
@@ -88,6 +66,9 @@
8866
?>
8967
</select>
9068
</td>
69+
<td>
70+
<select name="mfl[0]" class="form-control input-small facility" style="width:110px !important;">
71+
<option value="0">Select Facility</option>
9172
<?php
9273
$dropdown2=isset($donate_destination)&&($donate_destination == 'district')?
9374
'<td>
@@ -102,8 +83,6 @@
10283
<select name="mfl[0]" class="form-control input-small facility">
10384
<!-- donate_destination -->
10485
<option value="0">--select facility---</option>
105-
>>>>>>> 71f6b73604172b8170a8ed178c9286775e75c12c
106-
>>>>>>> 009c71465194e3d5f5df5d1d9e1da5d569082273
10786
</select>
10887
</td>'
10988
;

‎application/views/subcounty/ajax/county_consumption_data_filter_v.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,13 +184,15 @@
184184
</div>
185185
</div>
186186

187-
<div class="graph_content">
187+
<div class="graph_content" id="graph_content_">
188188
</div>
189189
<script>
190190
$(document).ready(function() {
191+
<?php echo $default_consumption_graph; ?>
192+
191193
json_obj = { "url" : "assets/img/calendar.gif'",};
192194
var baseUrl=json_obj.url;
193-
// -- Datepicker limit today
195+
// -- Datepicker limit today
194196
$(".clone_datepicker_normal_limit_today").datepicker({
195197
maxDate: new Date(),
196198
dateFormat: 'd M yy',

0 commit comments

Comments
 (0)