buscador en header, paginado en footer, cambio icons

Jose Pinto
1 parent a7f982c80c
Showing 2 changed files with 67 additions and 47 deletions Show diff stats
package.json
src/views/modal-domicilio.html
@@ -7,7 +7,7 @@
     "gulp-pre-commit": "gulp pre-commit",
     "compile": "gulp uglify",
     "postinstall": "npm run compile && gulp clean-post-install",
-    "install-dev": "npm install -D angular bootstrap font-awesome gulp gulp-angular-templatecache gulp-concat gulp-connect gulp-htmlmin gulp-jshint gulp-rename gulp-replace gulp-uglify gulp-clean jasmine-core jquery jshint pre-commit pump ui-bootstrap4 && npm i -D git+https://debo.suite.repo/modulos-npm/foca-directivas"
+    "install-dev": "npm install -D angular bootstrap font-awesome gulp gulp-angular-templatecache gulp-concat gulp-connect gulp-htmlmin gulp-jshint gulp-rename gulp-replace gulp-uglify gulp-clean jasmine-core jquery jshint pre-commit pump ui-bootstrap4 && npm i -D git+ssh://git@git.focasoftware.com:npm/foca-directivas"
   },
   "pre-commit": [
     "gulp-pre-commit"
@@ -33,12 +33,12 @@
     "gulp-uglify": "^3.0.1",
     "jquery": "^3.3.1",
     "pump": "^3.0.0",
-    "foca-directivas": "git+https://debo.suite.repo/modulos-npm/foca-directivas"
+    "foca-directivas": "git+ssh://git@git.focasoftware.com:npm/foca-directivas"
   },
   "devDependencies": {
     "angular": "^1.7.5",
     "bootstrap": "^4.1.3",
-    "foca-directivas": "git+https://debo.suite.repo/modulos-npm/foca-directivas",
+    "foca-directivas": "git+ssh://git@git.focasoftware.com:npm/foca-directivas",
     "font-awesome": "^4.7.0",
     "gulp": "^3.9.1",
     "gulp-angular-templatecache": "^2.2.3",
 <div class="modal-header py-1">
-    <h5 class="modal-title">Busqueda de Domicilios</h5>
+    <div class="row w-100">
+        <div class="col-lg-6">
+            <h5 class="modal-title my-1">Búsqueda de Domicilios</h5>
+        </div>
+        <div class="input-group col-lg-6 pr-0 my-2">
+            <input 
+                type="text" 
+                class="form-control form-control-sm" 
+                placeholder="Búsqueda" 
+                ng-model="filters" 
+                ng-change="search()" 
+                ng-keydown="busquedaDown($event.keyCode)"
+                ng-keypress="busquedaPress($event.keyCode)"
+                foca-focus="selectedDomicilio == -1"
+                ng-focus="selectedDomicilio = -1"
+                teclado-virtual
+            >
+            <div class="input-group-append">
+                <button
+                    ladda="searchLoading"
+                    class="btn btn-outline-secondary"
+                    type="button"
+                >
+                    <i class="fa fa-search" aria-hidden="true"></i>
+                </button>
+            </div>
+        </div>
+    </div>
 </div>
 <div class="modal-body" id="modal-body">
-    <div class="input-group" ng-show="!ingreso">
-        <input 
-            type="text" 
-            class="form-control form-control-sm" 
-            placeholder="Busqueda" 
-            ng-model="filters" 
-            ng-change="search()" 
-            ng-keydown="busquedaDown($event.keyCode)"
-            ng-keypress="busquedaPress($event.keyCode)"
-            foca-focus="selectedDomicilio == -1"
-            ng-focus="selectedDomicilio = -1"
-            teclado-virtual
-        >
+
+    <div ng-show="!primerBusqueda">
+        Debe realizar una primer búsqueda.
+    </div>
+
+    <div ng-show="!ingreso">
         <table ng-show="!ingreso" class="table table-striped table-sm">
             <thead>
                 <tr>
@@ -53,7 +73,7 @@
                             ng-keydown="itemDomicilio($event.keyCode)"
                             ng-click="ingreso = !ingreso"
                         >
-                            <i class="fa fa-arrow-right" aria-hidden="true"></i>
+                            <i class="fa fa-circle-thin" aria-hidden="true"></i>
                         </button>
                     </td>
                 </tr>
@@ -75,40 +95,12 @@
                             foca-focus="selectedDomicilio == {{key + 1}}"
                             ng-keydown="itemDomicilio($event.keyCode)"
                         >
-                            <i class="fa fa-arrow-right" aria-hidden="true"></i>
+                            <i class="fa fa-circle-thin" aria-hidden="true"></i>
                         </button>
                     </td>
                 </tr>
             </tbody>
         </table>
-        <nav ng-show="currentPageDomicilios.length > 0 && !ingreso">
-            <ul class="pagination pagination-sm mb-0 justify-content-end">
-                <li class="page-item" ng-class="{'disabled': currentPage == 1}">
-                    <a class="page-link" href="javascript:void();" ng-click="selectPage(currentPage - 1)">
-                        <span aria-hidden="true">&laquo;</span>
-                        <span class="sr-only">Anterior</span>
-                    </a>
-                </li>
-                <li
-                    class="page-item" 
-                    ng-repeat="pagina in paginas" 
-                    ng-class="{'active': pagina == currentPage}"
-                >
-                    <a 
-                        class="page-link" 
-                        href="javascript:void();" 
-                        ng-click="selectPage(pagina)"
-                        ng-bind="pagina"
-                    ></a>
-                </li>
-                <li class="page-item" ng-class="{'disabled': currentPage == lastPage}">
-                    <a class="page-link" href="javascript:void();" ng-click="selectPage(currentPage + 1)">
-                        <span aria-hidden="true">&raquo;</span>
-                        <span class="sr-only">Siguiente</span>
-                    </a>
-                </li>
-            </ul>
-        </nav>
     </div>
     <form name="formDomicilio" ng-show="ingreso">
         <div class="row">
@@ -179,6 +171,34 @@
     </form>
 </div>
 <div class="modal-footer">
+    <nav ng-show="currentPageDomicilios.length > 0 && !ingreso" class="mr-auto">
+        <ul class="pagination pagination-sm mb-0 justify-content-end">
+            <li class="page-item" ng-class="{'disabled': currentPage == 1}">
+                <a class="page-link" href="javascript:void();" ng-click="selectPage(currentPage - 1)">
+                    <span aria-hidden="true">&laquo;</span>
+                    <span class="sr-only">Anterior</span>
+                </a>
+            </li>
+            <li
+                class="page-item" 
+                ng-repeat="pagina in paginas" 
+                ng-class="{'active': pagina == currentPage}"
+            >
+                <a 
+                    class="page-link" 
+                    href="javascript:void();" 
+                    ng-click="selectPage(pagina)"
+                    ng-bind="pagina"
+                ></a>
+            </li>
+            <li class="page-item" ng-class="{'disabled': currentPage == lastPage}">
+                <a class="page-link" href="javascript:void();" ng-click="selectPage(currentPage + 1)">
+                    <span aria-hidden="true">&raquo;</span>
+                    <span class="sr-only">Siguiente</span>
+                </a>
+            </li>
+        </ul>
+    </nav>
     <button
         ng-show="!ingreso"
         class="btn btn-sm btn-secondary"
...	...	@@ -7,7 +7,7 @@
7	7	"gulp-pre-commit": "gulp pre-commit",
8	8	"compile": "gulp uglify",
9	9	"postinstall": "npm run compile && gulp clean-post-install",
10		- "install-dev": "npm install -D angular bootstrap font-awesome gulp gulp-angular-templatecache gulp-concat gulp-connect gulp-htmlmin gulp-jshint gulp-rename gulp-replace gulp-uglify gulp-clean jasmine-core jquery jshint pre-commit pump ui-bootstrap4 && npm i -D git+https://debo.suite.repo/modulos-npm/foca-directivas"
	10	+ "install-dev": "npm install -D angular bootstrap font-awesome gulp gulp-angular-templatecache gulp-concat gulp-connect gulp-htmlmin gulp-jshint gulp-rename gulp-replace gulp-uglify gulp-clean jasmine-core jquery jshint pre-commit pump ui-bootstrap4 && npm i -D git+ssh://git@git.focasoftware.com:npm/foca-directivas"
11	11	},
12	12	"pre-commit": [
13	13	"gulp-pre-commit"
...	...	@@ -33,12 +33,12 @@
33	33	"gulp-uglify": "^3.0.1",
34	34	"jquery": "^3.3.1",
35	35	"pump": "^3.0.0",
36		- "foca-directivas": "git+https://debo.suite.repo/modulos-npm/foca-directivas"
	36	+ "foca-directivas": "git+ssh://git@git.focasoftware.com:npm/foca-directivas"
37	37	},
38	38	"devDependencies": {
39	39	"angular": "^1.7.5",
40	40	"bootstrap": "^4.1.3",
41		- "foca-directivas": "git+https://debo.suite.repo/modulos-npm/foca-directivas",
	41	+ "foca-directivas": "git+ssh://git@git.focasoftware.com:npm/foca-directivas",
42	42	"font-awesome": "^4.7.0",
43	43	"gulp": "^3.9.1",
44	44	"gulp-angular-templatecache": "^2.2.3",
1	1	<div class="modal-header py-1">
2		- <h5 class="modal-title">Busqueda de Domicilios</h5>
	2	+ <div class="row w-100">
	3	+ <div class="col-lg-6">
	4	+ <h5 class="modal-title my-1">Búsqueda de Domicilios</h5>
	5	+ </div>
	6	+ <div class="input-group col-lg-6 pr-0 my-2">
	7	+ <input
	8	+ type="text"
	9	+ class="form-control form-control-sm"
	10	+ placeholder="Búsqueda"
	11	+ ng-model="filters"
	12	+ ng-change="search()"
	13	+ ng-keydown="busquedaDown($event.keyCode)"
	14	+ ng-keypress="busquedaPress($event.keyCode)"
	15	+ foca-focus="selectedDomicilio == -1"
	16	+ ng-focus="selectedDomicilio = -1"
	17	+ teclado-virtual
	18	+ >
	19	+ <div class="input-group-append">
	20	+ <button
	21	+ ladda="searchLoading"
	22	+ class="btn btn-outline-secondary"
	23	+ type="button"
	24	+ >
	25	+ <i class="fa fa-search" aria-hidden="true"></i>
	26	+ </button>
	27	+ </div>
	28	+ </div>
	29	+ </div>
3	30	</div>
4	31	<div class="modal-body" id="modal-body">
5		- <div class="input-group" ng-show="!ingreso">
6		- <input
7		- type="text"
8		- class="form-control form-control-sm"
9		- placeholder="Busqueda"
10		- ng-model="filters"
11		- ng-change="search()"
12		- ng-keydown="busquedaDown($event.keyCode)"
13		- ng-keypress="busquedaPress($event.keyCode)"
14		- foca-focus="selectedDomicilio == -1"
15		- ng-focus="selectedDomicilio = -1"
16		- teclado-virtual
17		- >
	32	+
	33	+ <div ng-show="!primerBusqueda">
	34	+ Debe realizar una primer búsqueda.
	35	+ </div>
	36	+
	37	+ <div ng-show="!ingreso">
18	38	<table ng-show="!ingreso" class="table table-striped table-sm">
19	39	<thead>
20	40	<tr>
...	...	@@ -53,7 +73,7 @@
53	73	ng-keydown="itemDomicilio($event.keyCode)"
54	74	ng-click="ingreso = !ingreso"
55	75	>
56		- <i class="fa fa-arrow-right" aria-hidden="true"></i>
	76	+ <i class="fa fa-circle-thin" aria-hidden="true"></i>
57	77	</button>
58	78	</td>
59	79	</tr>
...	...	@@ -75,40 +95,12 @@
75	95	foca-focus="selectedDomicilio == {{key + 1}}"
76	96	ng-keydown="itemDomicilio($event.keyCode)"
77	97	>
78		- <i class="fa fa-arrow-right" aria-hidden="true"></i>
	98	+ <i class="fa fa-circle-thin" aria-hidden="true"></i>
79	99	</button>
80	100	</td>
81	101	</tr>
82	102	</tbody>
83	103	</table>
84		- <nav ng-show="currentPageDomicilios.length > 0 && !ingreso">
85		- <ul class="pagination pagination-sm mb-0 justify-content-end">
86		- <li class="page-item" ng-class="{'disabled': currentPage == 1}">
87		- <a class="page-link" href="javascript:void();" ng-click="selectPage(currentPage - 1)">
88		- <span aria-hidden="true">«</span>
89		- <span class="sr-only">Anterior</span>
90		- </a>
91		- </li>
92		- <li
93		- class="page-item"
94		- ng-repeat="pagina in paginas"
95		- ng-class="{'active': pagina == currentPage}"
96		- >
97		- <a
98		- class="page-link"
99		- href="javascript:void();"
100		- ng-click="selectPage(pagina)"
101		- ng-bind="pagina"
102		- ></a>
103		- </li>
104		- <li class="page-item" ng-class="{'disabled': currentPage == lastPage}">
105		- <a class="page-link" href="javascript:void();" ng-click="selectPage(currentPage + 1)">
106		- <span aria-hidden="true">»</span>
107		- <span class="sr-only">Siguiente</span>
108		- </a>
109		- </li>
110		- </ul>
111		- </nav>
112	104	</div>
113	105	<form name="formDomicilio" ng-show="ingreso">
114	106	<div class="row">
...	...	@@ -179,6 +171,34 @@
179	171	</form>
180	172	</div>
181	173	<div class="modal-footer">
	174	+ <nav ng-show="currentPageDomicilios.length > 0 && !ingreso" class="mr-auto">
	175	+ <ul class="pagination pagination-sm mb-0 justify-content-end">
	176	+ <li class="page-item" ng-class="{'disabled': currentPage == 1}">
	177	+ <a class="page-link" href="javascript:void();" ng-click="selectPage(currentPage - 1)">
	178	+ <span aria-hidden="true">«</span>
	179	+ <span class="sr-only">Anterior</span>
	180	+ </a>
	181	+ </li>
	182	+ <li
	183	+ class="page-item"
	184	+ ng-repeat="pagina in paginas"
	185	+ ng-class="{'active': pagina == currentPage}"
	186	+ >
	187	+ <a
	188	+ class="page-link"
	189	+ href="javascript:void();"
	190	+ ng-click="selectPage(pagina)"
	191	+ ng-bind="pagina"
	192	+ ></a>
	193	+ </li>
	194	+ <li class="page-item" ng-class="{'disabled': currentPage == lastPage}">
	195	+ <a class="page-link" href="javascript:void();" ng-click="selectPage(currentPage + 1)">
	196	+ <span aria-hidden="true">»</span>
	197	+ <span class="sr-only">Siguiente</span>
	198	+ </a>
	199	+ </li>
	200	+ </ul>
	201	+ </nav>
182	202	<button
183	203	ng-show="!ingreso"
184	204	class="btn btn-sm btn-secondary"