diff --git a/config/session.php b/config/session.php index 9f9f5d2..662f68c 100755 --- a/config/session.php +++ b/config/session.php @@ -2,7 +2,9 @@ // Valida si existe una session de no existir te envia al login y si sirve extrae los datos del usuario para poder usarlos déspues - session_start(); + if (session_status() == PHP_SESSION_NONE){ + session_start(); + } $db = new Database(); diff --git a/controllers/admin.php b/controllers/admin.php index dd81f77..c60fadc 100755 --- a/controllers/admin.php +++ b/controllers/admin.php @@ -4,7 +4,7 @@ class Admin extends Controller { function __construct(){ parent::__construct(); - if (session_status() == PHP_SESSION_NONE) { + if (session_status() == PHP_SESSION_NONE){ session_start(); } $tabla = $this -> tableUsers(); @@ -13,16 +13,23 @@ function __construct(){ function tableUsers(){ $query = new UserModel(); + if ($this -> existPOST(['busqueda'])) { $busqueda = $this -> getPost('busqueda'); - return $query -> busqueda($busqueda, $_SESSION['user']); + return $query -> tableUsers($busqueda, $_SESSION['user']); } - return $query -> tableUsers($_SESSION['user']); + return $query -> tableUsers(NULL,$_SESSION['user']); } function delete(){ - + + header('Content-Type: application/json'); + + if ($this -> existPOST(['passEjecutivo','eliminar'])) { + $data = "Hola!"; + echo json_encode($data); + } } function update(){ diff --git a/controllers/login.php b/controllers/login.php index bf055b9..d20e202 100755 --- a/controllers/login.php +++ b/controllers/login.php @@ -38,7 +38,7 @@ function authenticate(){ } else { - $this->redirect('', ['error' => Errors::ERROR_LOGIN_LOGIN]); + $this-redirect('', ['error' => Errors::ERROR_LOGIN_LOGIN]); } } diff --git a/libs/view.php b/libs/view.php index 2610a60..de6bbb7 100755 --- a/libs/view.php +++ b/libs/view.php @@ -10,7 +10,9 @@ function render($nombre, $data = []){ $this->d = $data; $this->handleMessages(); - + if (!empty($_GET['url']) && $_GET['url'] !== 'recuperar') { + require_once 'config/session.php'; + } require 'views/' . $nombre . '.php'; } diff --git a/models/usermodel.php b/models/usermodel.php index c477b79..d6d431d 100755 --- a/models/usermodel.php +++ b/models/usermodel.php @@ -194,77 +194,30 @@ function escape($value){ return $return; } - - function busqueda($busqueda, $id){ - $q = $this -> escape($busqueda); + + function tableUsers($busqueda, $id){ + $this -> getUsers($id); $num_client = $this -> getNum_Client(); $id_client = $num_client[0]; + $status = "activo"; - try { - $query = $this -> prepare("SELECT * FROM users WHERE num_client LIKE '%". $id_client ."%' AND name LIKE '%". $q ."%'"); - $query -> execute(); - - $results = $query -> fetchAll(PDO::FETCH_OBJ); - - if (is_countable($results) > 0) { - $i = 1; - $data = ''; - foreach($results as $cliente){ - - if($cliente -> num_client !== $num_client) - $data .= - ' - '. $i .' - '. $cliente -> name .' - '. $cliente -> num_client .' - -
- - -
- - -
- - -
- - -
- - -
- - '; - $i++; - } + $sql = "SELECT * FROM users WHERE num_client LIKE '%" . $id_client ."%' AND status LIKE '%". $status ."%' ORDER BY id"; - return $data; - } - - if (empty($results)) { - return "No se encontraron coincidencias con sus criterios de búsqueda!"; - } - } catch (PDOException $e){ - echo $e; + if ($busqueda !== NULL) { + $q = $this -> escape($busqueda); + $sql = "SELECT * FROM users WHERE num_client LIKE '%". $id_client ."%' AND name LIKE '%". $q ."%' AND status LIKE '%". $status ."%'"; } - } - - function tableUsers($id){ - $this -> getUsers($id); - $num_client = $this -> getNum_Client(); - $id_client = $num_client[0]; try { - $query = $this -> prepare("SELECT * FROM users WHERE num_client LIKE '%" . $id_client ."%' ORDER BY id"); + $query = $this -> prepare($sql); $query -> execute(); $results = $query -> fetchAll(PDO::FETCH_OBJ); + $data = ''; - if (is_countable($results) > 0) { - $data = ''; - $i = 1; + if (count($results) > 0) { + $i = 0; foreach($results as $user){ if($user -> num_client !== $num_client) @@ -273,11 +226,8 @@ function tableUsers($id){ '. $i .' '. $user -> name .' '. $user -> num_client .' - -
- - -
+ +
@@ -287,7 +237,7 @@ function tableUsers($id){ - +
@@ -298,9 +248,9 @@ function tableUsers($id){ return $data; } - if (empty($results)) { - return "No se encontraron coincidencias con sus criterios de búsqueda!"; - } + return '

No se encontraron coincidencias con sus criterios de búsqueda


'; + + } catch (PDOException $e){ echo $e; } diff --git a/public/.sass-cache/fc3398fd260d023c699eef8d56e9a50fceffe83b/admin.scssc b/public/.sass-cache/fc3398fd260d023c699eef8d56e9a50fceffe83b/admin.scssc new file mode 100644 index 0000000..83a9a3d Binary files /dev/null and b/public/.sass-cache/fc3398fd260d023c699eef8d56e9a50fceffe83b/admin.scssc differ diff --git a/public/.sass-cache/fc3398fd260d023c699eef8d56e9a50fceffe83b/nav.scssc b/public/.sass-cache/fc3398fd260d023c699eef8d56e9a50fceffe83b/nav.scssc index 4b93f83..c8cf772 100644 Binary files a/public/.sass-cache/fc3398fd260d023c699eef8d56e9a50fceffe83b/nav.scssc and b/public/.sass-cache/fc3398fd260d023c699eef8d56e9a50fceffe83b/nav.scssc differ diff --git a/public/css/admin.css b/public/css/admin.css new file mode 100644 index 0000000..c1bad91 --- /dev/null +++ b/public/css/admin.css @@ -0,0 +1,25 @@ +@import url(../css/global.css); +.modal { + display: none; + position: fixed; + margin: auto 0; + z-index: 2; + left: 0; + top: 0; + width: 100%; + height: 100%; + overflow: auto; + background-color: black; + background-color: rgba(0, 0, 0, 0.4); } + .modal .modal-content { + position: relative; + background-color: #fefefe; + margin: auto; + padding: 0; + width: 40%; } + .modal .modal-header { + padding: 2px 16px; } + .modal .modal-body { + padding: 5px 15px; } + +/*# sourceMappingURL=admin.css.map */ diff --git a/public/css/admin.css.map b/public/css/admin.css.map new file mode 100644 index 0000000..c803826 --- /dev/null +++ b/public/css/admin.css.map @@ -0,0 +1,7 @@ +{ +"version": 3, +"mappings": "AAEQ,8BAAsB;AAS9B,MAAO;EACH,OAAO,EAAE,IAAI;EACb,QAAQ,EAAE,KAAK;EACf,MAAM,EAAC,MAAM;EACb,OAAO,EAAE,CAAC;EACV,IAAI,EAAE,CAAC;EACP,GAAG,EAAE,CAAC;EACN,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI;EACZ,QAAQ,EAAE,IAAI;EACd,gBAAgB,EAbA,KAAU;EAc1B,gBAAgB,EAfL,kBAAe;EAiB1B,qBAAe;IACX,QAAQ,EAAE,QAAQ;IAClB,gBAAgB,EApBN,OAAO;IAqBjB,MAAM,EAAE,IAAI;IACZ,OAAO,EAAE,CAAC;IACV,KAAK,EAAE,GAAG;EAGd,oBAAc;IAAC,OAAO,EAAE,QAAQ;EAChC,kBAAY;IAAC,OAAO,EAAE,QAAQ", +"sources": ["../sass/admin.scss"], +"names": [], +"file": "admin.css" +} \ No newline at end of file diff --git a/public/css/nav.css b/public/css/nav.css index 5f9e8b4..2ee8b30 100644 --- a/public/css/nav.css +++ b/public/css/nav.css @@ -22,7 +22,7 @@ overflow: hidden; -webkit-transition: width .05s linear; transition: width .05s linear; - z-index: 1000; } + z-index: 1; } .main-menu:hover, .main-menu.expanded { width: 250px; overflow: visible; } diff --git a/public/css/nav.css.map b/public/css/nav.css.map index f4d8800..e016dcd 100644 --- a/public/css/nav.css.map +++ b/public/css/nav.css.map @@ -1,6 +1,6 @@ { "version": 3, -"mappings": "AAAA,MAAO;EAAC,SAAS,EAAE,GAAG;;AAEtB,GAAI;EACA,QAAQ,EAAE,QAAQ;EAClB,OAAO,EAAE,UAAU;EACnB,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI;EACZ,UAAU,EAAE,MAAM;EAClB,cAAc,EAAE,MAAM;EACtB,SAAS,EAAC,IAAI;;AAGlB,UAAW;EACP,UAAU,EAAC,OAAO;EAClB,YAAY,EAAC,iBAAiB;EAC9B,QAAQ,EAAC,QAAQ;EACjB,GAAG,EAAC,CAAC;EACL,MAAM,EAAC,CAAC;EACR,MAAM,EAAC,IAAI;EACX,IAAI,EAAC,CAAC;EACN,KAAK,EAAC,IAAI;EACV,QAAQ,EAAC,MAAM;EACf,kBAAkB,EAAC,iBAAiB;EACpC,UAAU,EAAC,iBAAiB;EAE5B,OAAO,EAAC,IAAI;EAEZ,qCAAoB;IAChB,KAAK,EAAC,KAAK;IACX,QAAQ,EAAC,OAAO;EAGpB,eAAK;IAAC,MAAM,EAAC,KAAK;EAElB,aAAG;IACC,QAAQ,EAAC,QAAQ;IACjB,OAAO,EAAC,KAAK;IACb,KAAK,EAAC,KAAK;IAEX,iBAAI;MACA,QAAQ,EAAC,QAAQ;MACjB,OAAO,EAAC,KAAK;MACb,eAAe,EAAC,QAAQ;MACxB,cAAc,EAAC,CAAC;MAChB,KAAK,EAAC,IAAI;MACV,WAAW,EAAE,KAAK;MAClB,SAAS,EAAE,IAAI;MACf,eAAe,EAAC,IAAI;MAEpB,kBAAkB,EAAC,cAAc;MACjC,UAAU,EAAC,cAAc;MAEzB,uBAAQ;QACJ,KAAK,EAAC,IAAI;QACV,gBAAgB,EAAC,OAAO;EAKpC,oBAAU;IACN,QAAQ,EAAC,QAAQ;IACjB,OAAO,EAAC,UAAU;IAClB,cAAc,EAAC,MAAM;IACrB,KAAK,EAAC,KAAK;IACX,WAAW,EAAE,2BAA2B;EAG5C,sBAAY;IACR,QAAQ,EAAC,QAAQ;IACjB,IAAI,EAAC,CAAC;IACN,MAAM,EAAC,CAAC;;AAKhB,gBAAgB;EACZ,eAAe,EAAC,IAAI;;AAGxB,GAAI;EACA,mBAAmB,EAAC,IAAI;EACxB,gBAAgB,EAAC,IAAI;EACrB,eAAe,EAAC,IAAI;EACpB,cAAc,EAAC,IAAI;EACnB,WAAW,EAAC,IAAI;EAEhB,cAAO;IACH,OAAO,EAAC,CAAC;IACT,MAAM,EAAC,CAAC;IACR,OAAO,EAAC,CAAC;;AAIjB,KAAM;EACF,gBAAgB,EAAE,OAAO;EACzB,YAAY,EAAE,IAAI", +"mappings": "AAAA,MAAO;EAAC,SAAS,EAAE,GAAG;;AAEtB,GAAI;EACA,QAAQ,EAAE,QAAQ;EAClB,OAAO,EAAE,UAAU;EACnB,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI;EACZ,UAAU,EAAE,MAAM;EAClB,cAAc,EAAE,MAAM;EACtB,SAAS,EAAC,IAAI;;AAGlB,UAAW;EACP,UAAU,EAAC,OAAO;EAClB,YAAY,EAAC,iBAAiB;EAC9B,QAAQ,EAAC,QAAQ;EACjB,GAAG,EAAC,CAAC;EACL,MAAM,EAAC,CAAC;EACR,MAAM,EAAC,IAAI;EACX,IAAI,EAAC,CAAC;EACN,KAAK,EAAC,IAAI;EACV,QAAQ,EAAC,MAAM;EACf,kBAAkB,EAAC,iBAAiB;EACpC,UAAU,EAAC,iBAAiB;EAE5B,OAAO,EAAC,CAAC;EAET,qCAAoB;IAChB,KAAK,EAAC,KAAK;IACX,QAAQ,EAAC,OAAO;EAGpB,eAAK;IAAC,MAAM,EAAC,KAAK;EAElB,aAAG;IACC,QAAQ,EAAC,QAAQ;IACjB,OAAO,EAAC,KAAK;IACb,KAAK,EAAC,KAAK;IAEX,iBAAI;MACA,QAAQ,EAAC,QAAQ;MACjB,OAAO,EAAC,KAAK;MACb,eAAe,EAAC,QAAQ;MACxB,cAAc,EAAC,CAAC;MAChB,KAAK,EAAC,IAAI;MACV,WAAW,EAAE,KAAK;MAClB,SAAS,EAAE,IAAI;MACf,eAAe,EAAC,IAAI;MAEpB,kBAAkB,EAAC,cAAc;MACjC,UAAU,EAAC,cAAc;MAEzB,uBAAQ;QACJ,KAAK,EAAC,IAAI;QACV,gBAAgB,EAAC,OAAO;EAKpC,oBAAU;IACN,QAAQ,EAAC,QAAQ;IACjB,OAAO,EAAC,UAAU;IAClB,cAAc,EAAC,MAAM;IACrB,KAAK,EAAC,KAAK;IACX,WAAW,EAAE,2BAA2B;EAG5C,sBAAY;IACR,QAAQ,EAAC,QAAQ;IACjB,IAAI,EAAC,CAAC;IACN,MAAM,EAAC,CAAC;;AAKhB,gBAAgB;EACZ,eAAe,EAAC,IAAI;;AAGxB,GAAI;EACA,mBAAmB,EAAC,IAAI;EACxB,gBAAgB,EAAC,IAAI;EACrB,eAAe,EAAC,IAAI;EACpB,cAAc,EAAC,IAAI;EACnB,WAAW,EAAC,IAAI;EAEhB,cAAO;IACH,OAAO,EAAC,CAAC;IACT,MAAM,EAAC,CAAC;IACR,OAAO,EAAC,CAAC;;AAIjB,KAAM;EACF,gBAAgB,EAAE,OAAO;EACzB,YAAY,EAAE,IAAI", "sources": ["../sass/nav.scss"], "names": [], "file": "nav.css" diff --git a/public/js/admin.js b/public/js/admin.js new file mode 100644 index 0000000..d255822 --- /dev/null +++ b/public/js/admin.js @@ -0,0 +1,12 @@ +var borrar = document.getElementById("eliminar"); +var modal = document.getElementById("myModal"); + +function openModal(id){ + modal.style.display = "block"; + borrar.value = id; + console.log(id); +} + +function closedModal(){ + modal.style.display = "none"; +} \ No newline at end of file diff --git a/public/sass/admin.scss b/public/sass/admin.scss new file mode 100644 index 0000000..7c264f5 --- /dev/null +++ b/public/sass/admin.scss @@ -0,0 +1,35 @@ +// Importamos el css global + +@import url(../css/global.css); + +//Background-color + +$bg-content-modal:#fefefe; +$bg-body-modal:rgba(0,0,0,0.4); +$bg-secondary-modal:rgb(0,0,0); + +// Classes +.modal { + display: none; + position: fixed; + margin:auto 0; + z-index: 2; + left: 0; + top: 0; + width: 100%; + height: 100%; + overflow: auto; + background-color: $bg-secondary-modal; + background-color: $bg-body-modal; + + .modal-content { + position: relative; + background-color: $bg-content-modal; + margin: auto; + padding: 0; + width: 40%; + } + + .modal-header {padding: 2px 16px;} + .modal-body {padding: 5px 15px;} +} \ No newline at end of file diff --git a/public/sass/nav.scss b/public/sass/nav.scss index c0ca2ca..039e8e4 100644 --- a/public/sass/nav.scss +++ b/public/sass/nav.scss @@ -23,7 +23,7 @@ -webkit-transition:width .05s linear; transition:width .05s linear; //-webkit-transform:translateZ(0) scale(1,1); - z-index:1000; + z-index:1; &:hover, &.expanded { width:250px; diff --git a/views/admin/index.php b/views/admin/index.php index b56baed..073e853 100755 --- a/views/admin/index.php +++ b/views/admin/index.php @@ -5,7 +5,7 @@ - + JADAR BANK @@ -32,5 +32,44 @@ + + + \ No newline at end of file