Commit 40ac2d17ed62e23edc6d5afaed3621e36668ff11

Authored by Nicolás Guarnieri
Exists in master and in 1 other branch develop

Merge branch 'master' into 'master'

agrego decimales

See merge request !2
... ... @@ -8,7 +8,7 @@
8 8 "gulp-pre-commit": "gulp pre-commit",
9 9 "compile": "gulp uglify",
10 10 "postinstall": "npm run compile && gulp clean-post-install",
11   - "install-dev": "npm install -D angular font-awesome pump jquery bootstrap ui-bootstrap4 jshint gulp gulp-uglify gulp-concat gulp-htmlmin gulp-rename gulp-uglify gulp-jshint gulp-replace gulp-connect gulp-clean gulp-angular-templatecache git+https://debo.suite.repo/modulos-npm/foca-directivas.git"
  11 + "install-dev": "npm install -D angular font-awesome pump jquery bootstrap ui-bootstrap4 jshint gulp gulp-uglify gulp-concat gulp-htmlmin gulp-rename gulp-uglify gulp-jshint gulp-replace gulp-connect gulp-clean gulp-angular-templatecache git+http://git.focasoftware.com/npm/foca-directivas.git"
12 12 },
13 13 "pre-commit": [
14 14 "gulp-pre-commit"
... ... @@ -22,7 +22,7 @@
22 22 "devDependencies": {
23 23 "angular": "^1.7.5",
24 24 "bootstrap": "^4.1.3",
25   - "foca-directivas": "git+https://debo.suite.repo/modulos-npm/foca-directivas.git",
  25 + "foca-directivas": "git+http://git.focasoftware.com/npm/foca-directivas.git",
26 26 "font-awesome": "^4.7.0",
27 27 "gulp": "^3.9.1",
28 28 "gulp-angular-templatecache": "^2.2.3",
src/js/controller.js
... ... @@ -8,7 +8,7 @@ angular.module('focaModalCotizacion')
8 8 'idMoneda',
9 9 function($filter, $scope, $uibModalInstance, focaModalCotizacionService, idMoneda) {
10 10 focaModalCotizacionService.getCotizaciones(idMoneda).then(
11   - function(res) {console.log(res.data);
  11 + function(res) {
12 12 $scope.moneda = res.data[0];
13 13 $scope.cotizacion = res.data[0].cotizaciones;
14 14 $scope.search();
src/views/modal-cotizacion.html
... ... @@ -7,8 +7,8 @@
7 7 <thead>
8 8 <tr>
9 9 <th>Fecha</th>
10   - <th>Compra</th>
11   - <th>Venta</th>
  10 + <th class="text-right">Compra</th>
  11 + <th class="text-right">Venta</th>
12 12 <th></th>
13 13 </tr>
14 14 </thead>
... ... @@ -19,8 +19,8 @@
19 19 ng-click="select(cotizacion)"
20 20 >
21 21 <td ng-bind="cotizacion.FECHA | date:'dd/MM/yyyy HH:mm'"></td>
22   - <td ng-bind="cotizacion.COTIZACION"></td>
23   - <td ng-bind="cotizacion.VENDEDOR | number:2"></td>
  22 + <td ng-bind="cotizacion.COTIZACION | number: 2" class="text-right"></td>
  23 + <td ng-bind="cotizacion.VENDEDOR | number: 2" class="text-right"></td>
24 24 <td>
25 25 <button
26 26 type="button"