![(please configure the [header_logo] section in trac.ini)](/space/chrome/site/your_project_logo.png){kind=logo}
Changeset 423 for pro-violet-viettel/sourcecode
- Timestamp:
- Nov 5, 2014 6:52:35 PM (11 years ago)
- Location:
- pro-violet-viettel/sourcecode
- Files:
-
- 3 added
- 1 deleted
- 8 edited
-
application/config/routes.php (modified) (1 diff)
-
application/modules/admin/controllers/admin_acc.php (modified) (4 diffs)
-
application/modules/admin/controllers/home.php (modified) (3 diffs)
-
application/modules/admin/views/admin_acc/admin_profile.php (added)
-
application/modules/admin/views/admin_acc/edit_admin.php (added)
-
application/modules/admin/views/admin_acc/index.php (modified) (2 diffs)
-
application/modules/admin/views/admin_acc/listview.php (modified) (3 diffs)
-
application/modules/admin/views/admin_acc/view_admin.php (added)
-
application/modules/admin/views/login.php (modified) (2 diffs)
-
application/modules/admin/views/user_profile.php (deleted)
-
application/views/layout/admin/header.php (modified) (1 diff)
-
assets/js/admin/admin.js (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
pro-violet-viettel/sourcecode/application/config/routes.php
r422 r423 85 85 $route['admin/quan_tri_vien/sua/:any'] = 'admin/admin_acc/edit_admin/$1'; 86 86 $route['admin/quan_tri_vien/xoa/:any'] = 'admin/admin_acc/delete_admin/$1'; 87 $route['admin/quan_tri_vien/id/:any'] = 'admin/admin_acc/get_admin_by_id/$1'; 87 $route['admin/quan_tri_vien/cap_nhat'] = 'admin/admin_acc/update_admin'; 88 $route['admin/quan_tri_vien/xem/:any'] = 'admin/admin_acc/get_admin_by_id/$1'; 88 89 89 90 $route['admin/nguoi_dung'] = 'admin/user'; -
pro-violet-viettel/sourcecode/application/modules/admin/controllers/admin_acc.php
r392 r423 131 131 if ($admin_info) 132 132 { 133 /* 133 134 $input = $this->input->post(); 134 135 $result = array(); … … 144 145 $result['success'] = 1; 145 146 } 147 echo json_encode($result);* 148 */ 149 $admin_id = $this->uri->segment(4); 150 $this->load->model('admin_model'); 151 $data = $this->admin_model->search_by_id($admin_id); 152 $this->load->view('admin_acc/edit_admin', $data); 153 }else 154 { 155 $this->load->view('login'); 156 } 157 } 158 159 public function update_admin() 160 { 161 $admin_info = $this->session->userdata('adminInfo'); 162 if ($admin_info) 163 { 164 $input = $this->input->post(); 165 $result = array(); 166 $result['success'] = 0; 167 //$admin_id = $this->uri->segment(4); 168 $this->load->model('admin_model'); 169 $input['updated_time']=date("Y-m-d H:i:s"); 170 $this->admin_model->update($input['admin_id'], $input); 171 $result['success'] = 1; 146 172 echo json_encode($result); 147 173 }else … … 150 176 } 151 177 } 152 178 153 179 public function delete_admin() 154 180 { … … 179 205 if ($admin_info) 180 206 { 181 $result = array(); 182 $result['success'] = 0; 183 $admin_id = (int)$this->uri->segment(4, 0); 184 if ($admin_id == 0) 185 { 186 $result['success'] = 0; 187 }else 188 { 189 $this->load->model('admin_model'); 190 $data = $this->admin_model->search_by_id($admin_id); 191 $result['item'] = $data; 192 $result['success'] = 1; 193 } 194 echo json_encode($result); 207 $admin_id = (int)$this->uri->segment(4); 208 $this->load->model('admin_model'); 209 $data = $this->admin_model->search_by_id($admin_id); 210 $this->load->view('admin_acc/view_admin', $data); 195 211 }else 196 212 { -
pro-violet-viettel/sourcecode/application/modules/admin/controllers/home.php
r368 r423 25 25 { 26 26 27 $ username = $this->input->post('user_admin');28 $passw ord = $this->input->post('password');27 $login_name = $this->input->post('login_name'); 28 $passwd = $this->input->post('passwd'); 29 29 30 30 $this->load->model(array('admin_model')); 31 $data = $this->admin_model->check_login($ username, $password);31 $data = $this->admin_model->check_login($login_name, $passwd); 32 32 if ($data == null) 33 33 { … … 37 37 else 38 38 { 39 $admindata = array(' user_admin' => $username, "logined_in" => TRUE);39 $admindata = array('login_name' => $login_name, 'admin_id'=>$data->admin_id, "logined_in" => TRUE); 40 40 $this->session->set_userdata('adminInfo', $admindata); 41 41 redirect("/admin/home"); … … 49 49 } 50 50 51 public function user_profile()51 public function admin_profile() 52 52 { 53 53 $admin_info = $this->session->userdata('adminInfo'); 54 54 if($admin_info) 55 55 { 56 $this->load->view('user_profile'); 56 $admin_id = $admin_info['admin_id']; 57 $this->load->model(array('admin_model')); 58 $data = $this->admin_model->search_by_id($admin_id); 59 $this->load->view('admin_acc/admin_profile', $data); 57 60 }else 58 61 { -
pro-violet-viettel/sourcecode/application/modules/admin/views/admin_acc/index.php
r415 r423 57 57 filter(); 58 58 }); 59 60 $('[data-toggle="ajaxModal"]').on('click', 61 function(e) { 62 $('#ajaxModal').remove(); 63 e.preventDefault(); 64 var $this = $(this) 65 , $remote = $this.data('remote') || $this.attr('href') 66 , $modal = $('<div class="modal" id="ajaxModal"><div class="modal-body"></div></div>'); 67 $('body').append($modal); 68 $modal.modal({backdrop: 'static', keyboard: false}); 69 $modal.load($remote); 70 } 71 ); 59 72 } 60 73 … … 219 232 </div><!-- /.modal-content --> 220 233 </div><!-- /.modal-dialog --> 221 222 <!-- Edit Admin -->223 <div tabindex="-1" class="modal fade in" id="editAdmin">224 <div class="modal-dialog">225 <div class="modal-content">226 <div class="modal-header no-padding">227 <div class="table-header">228 <button aria-hidden="true" data-dismiss="modal" class="close" type="button">229 <span class="white">Ã</span>230 </button>231 Sá»a quản trá» viên232 </div>233 </div>234 235 <div class="modal-body">236 <form id="edit_frm" onsubmit="return false;" class="form-horizontal" role="form">237 <div class="form-group">238 <label for="form-field-1" class="col-sm-3 control-label no-padding-right"> Há» tên </label>239 <div class="col-sm-9">240 <span class="input-icon">241 <input type="text" name="full_name" placeholder="Há» tên" id="edit_full_name" value="">242 <i class="icon-user blue"></i>243 </span>244 </div>245 <label class="block clearfix has-error">246 <div class="help-block"> </div>247 </label>248 249 </div>250 <div class="form-group">251 <label for="form-field-2" class="col-sm-3 control-label no-padding-right"> Tà i khoản </label>252 <div class="col-sm-9">253 <label class="block clearfix has-error">254 <span class="input-icon">255 <input type="text" name="login_name" placeholder="Tà i khoản" id="edit_login_name" value="">256 <i class="icon-user blue"></i>257 </span>258 <div class="help-block"> </div>259 </label>260 </div>261 </div>262 263 <div class="form-group">264 <label for="form-field-3" class="col-sm-3 control-label no-padding-right"> Email </label>265 <div class="col-sm-9">266 <span class="input-icon">267 <input type="text" name="email" placeholder="Email" id="edit_email" value="">268 <i class="icon-envelope blue"></i>269 </span>270 </div>271 <label class="block clearfix has-error">272 <div class="help-block"> </div>273 </label>274 275 </div>276 <div class="form-group">277 <label for="form-field-4" class="col-sm-3 control-label no-padding-right"> Phone </label>278 <div class="col-sm-9">279 <span class="input-icon">280 <input type="text" name="phone" placeholder="Phone" id="edit_phone" value="">281 <i class="icon-phone blue"></i>282 </span>283 </div>284 <label class="block clearfix has-error">285 <div class="help-block"> </div>286 </label>287 288 </div>289 290 <div class="space-4"></div>291 <div class="clearfix form-actions">292 <div class="col-md-offset-3 col-md-9">293 <button type="button" id="edit" class="btn btn-info">294 <i class="icon-ok bigger-110"></i>295 Hoà n tất296 </button>297 298 299 <button type="reset" name="reset" class="btn">300 <i class="icon-undo bigger-110"></i>301 Xóa hết302 </button>303 </div>304 </div>305 </form>306 </div>307 </div>308 </div>309 </div>310 <!-- End Edit Admin -->311 312 234 <!-- Delete Admin --> 313 235 <div tabindex="-1" class="modal fade in" id="deleteAdmin"> -
pro-violet-viettel/sourcecode/application/modules/admin/views/admin_acc/listview.php
r415 r423 86 86 <th class="<?php if ($sorting_field == 'full_name') {echo $sorting_order;} else {echo "sorting";}?>" id="full_name" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 183px;" aria-label="Há» tên: activate to sort column ascending">Há» tên</th> 87 87 <th class="<?php if ($sorting_field == 'phone') {echo $sorting_order;} else {echo "sorting";}?>" id="phone" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 176px;" aria-label="Sá» Äiá»n thoại: activate to sort column ascending">Sá» Äiá»n thoại</th> 88 <th class="<?php if ($sorting_field == 'email') {echo $sorting_order;} else {echo "sorting";}?>" id="email" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 176px;" aria-label="Email: activate to sort column ascending">Email</th> 88 89 <th class="<?php if ($sorting_field == 'created_time') {echo $sorting_order;} else {echo "sorting";}?>" id="created_time" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 209px;" aria-label="Ngà y ÄÄng kÃœ: activate to sort column ascending"> 89 90 <i class="icon-time bigger-110 hidden-480"></i> … … 108 109 109 110 <td class=" "> 110 <a href="#"><?php echo $admin['login_name']; ?></a>111 <a data-toggle="ajaxModal" href='http://viettel.violet.vn/admin/quan_tri_vien/xem/<?php echo $admin['admin_id'];?>' data-toggle="modal" href="#view_admin"><?php echo $admin['login_name']; ?></a> 111 112 </td> 112 113 <td class="hidden-480 "><?php echo $admin['full_name']; ?></td> 113 114 <td class="hidden-480 "><?php echo $admin['phone']; ?></td> 115 <td class="hidden-480 "><?php echo $admin['email']; ?></td> 114 116 <td class=" "><?php echo $admin['created_time']; ?></td> 115 117 … … 121 123 <div class="visible-md visible-lg hidden-sm hidden-xs action-buttons"> 122 124 <a href="#" class="blue"> 123 <i class="icon-zoom-in bigger-130"></i>125 <i data-toggle="ajaxModal" href='http://viettel.violet.vn/admin/quan_tri_vien/xem/<?php echo $admin['admin_id'];?>' data-toggle="modal" href="#view_admin" class="icon-zoom-in bigger-130"></i> 124 126 </a> 125 127 126 <a href="#editAdmin" data-toggle="modal" data-admin-id=<?php echo $admin['admin_id']; ?> class="green"> 127 <i class="icon-pencil bigger-130"></i> 128 <!--a href="#editAdmin" data-toggle="modal" data-admin-id=<?php echo $admin['admin_id']; ?> class="green"--> 129 <a href="#" class="green"> 130 <i data-toggle="ajaxModal" href='http://viettel.violet.vn/admin/quan_tri_vien/sua/<?php echo $admin['admin_id'];?>' data-toggle="modal" href='#edit_admin' class="icon-pencil bigger-130"></i> 128 131 </a> 129 132 -
pro-violet-viettel/sourcecode/application/modules/admin/views/login.php
r347 r423 66 66 <label class="block clearfix"> 67 67 <span class="block input-icon input-icon-right"> 68 <input type="text" name=" user_admin" class="form-control" placeholder="Tà i khoản" />68 <input type="text" name="login_name" class="form-control" placeholder="Tà i khoản" /> 69 69 <i class="icon-user"></i> 70 70 </span> … … 74 74 <label class="block clearfix"> 75 75 <span class="block input-icon input-icon-right"> 76 <input type="password" name="passw ord" class="form-control" placeholder="Máºt khẩu" />76 <input type="password" name="passwd" class="form-control" placeholder="Máºt khẩu" /> 77 77 <i class="icon-lock"></i> 78 78 </span> -
pro-violet-viettel/sourcecode/application/views/layout/admin/header.php
r358 r423 61 61 <ul class="user-menu pull-right dropdown-menu dropdown-yellow dropdown-caret dropdown-close"> 62 62 <li> 63 <a href="<?php echo $base_url; ?>admin/home/ user_profile">63 <a href="<?php echo $base_url; ?>admin/home/admin_profile"> 64 64 <i class="icon-user"></i> 65 65 ThÎng tin cá nhân -
pro-violet-viettel/sourcecode/assets/js/admin/admin.js
r416 r423 74 74 }); 75 75 76 function updateAdmin(id){ 77 $.ajax({ 78 url: 'quan_tri_vien/cap_nhat', 79 type: "POST", 80 data: $("#editAdmin_"+id).serialize(), 81 success: function (data, textStatus, jqXHR) 82 { 83 $result = jQuery.parseJSON(data); 84 if ($result.success == "1") 85 { 86 filter(); 87 $('#close_'+id).click(); 88 } 89 else 90 { 91 /* 92 for(var i =0;i < $result.errors.length;i++) 93 { 94 var er= $result.errors[i]; 95 $("#add_user_"+id).append("<div class='error'>"+er+"</div>"); 96 }*/ 97 } 98 }, 99 error: function (jqXHR, textStatus, errorThrown) 100 { 101 $(".ajaxloading").hide(); 102 } 103 }); 104 return false; 105 } 106 76 107 $('#deleteAdmin').on('show.bs.modal', function(e) { 77 108 var id = $(e.relatedTarget).data('admin-id'); … … 117 148 clearFormFields('#delete_frm'); 118 149 }); 150 151 $("#edit_tab").click(function(){ 152 });
Note: See TracChangeset
for help on using the changeset viewer.
