Download as
Browse Code »

Commit 594fec5f99168b926ec0b1962572d239a7a0c78f

Authored by José Maria Villac Pinheiro
1 parent 3970214a
Exists in master and in 1 other branch Branch_8238183

V. 0.6.3 - Retirado o número mínimo de teclas digitadas para iniciar uma procura… 

…. Adicionada biblioteca LeafDoc.
Showing 6 changed files with 219 additions and 9 deletions   Show diff stats
client/src/App.js
  Diff comments   View file @594fec5
1 1 import React, { Component } from "react";
2 2 import logo from "./logo.svg";
3 3 import "./App.css";
4   -import SearchBar from "./components/search_bar";
5 4 import FindConsumer from "./components/findConsumer";
6 5  
7 6 class App extends Component {
... ... @@ -13,13 +12,10 @@ class App extends Component {
13 12 <h1 className="App-title">NEXUS Início da aplicação</h1>
14 13 </header>
15 14 <p className="App-intro">
16   - To get started, edit <code>src/App.js</code> and save to reload.
  15 + Digite o nome ou número de ligação de água abaixo
17 16 </p>
18 17 <p />
19   - <div>
20   - <SearchBar />
21   - </div>
22   - <p />
  18 +
23 19 <div>
24 20 <FindConsumer />
25 21 </div>
... ...
client/src/components/findConsumer.js
  Diff comments   View file @594fec5
... ... @@ -22,7 +22,7 @@ export default class FindConsumer extends Component&lt;*, State&gt; {
22 22 const { selectedOption } = this.state;
23 23 const value = selectedOption && selectedOption.title;
24 24 const getOptions = (input) => {
25   - if (input.length > 3 || input.length === 0) {
  25 + if (input.length > 0 || input.length === 0) {
26 26 return FindLikeConsumers(input, this.state.todosConsumidores).then((response) => {
27 27 return { options: response };
28 28 });
... ...
client/src/components/findLikeConsumers.js
  Diff comments   View file @594fec5
1 1 // React will search the list of all consumers that match part of its name
2 2 //
  3 +/**
  4 + *
  5 + * @param {*} partOfConsumerName
  6 + * @param {*} todosAqui
  7 + */
3 8 function FindLikeConsumers(partOfConsumerName, todosAqui) {
4 9 var partOfConsumerNameUppercase = partOfConsumerName.toUpperCase();
5 10 return new Promise(function(resolve, reject) {
... ... @@ -15,7 +20,11 @@ function FindLikeConsumers(partOfConsumerName, todosAqui) {
15 20 }
16 21 });
17 22 }
18   -
  23 +/**
  24 + *
  25 + * @param {*} element
  26 + * @param {*} index
  27 + */
19 28 function testIfContainsText(element, index) {
20 29 if (element.label.indexOf(this.partOfConsumerNameUppercase) !== -1 && this.maximumSearchLines > 0) {
21 30 var obj = {};
... ...
client/src/components/getAllConsumers.js
  Diff comments   View file @594fec5
1 1 // Get an array with the list of all consumers
2 2 // React client will ask nodejs server for the list of all consumers
3 3 //
  4 +/**
  5 + * Get all consumer names and codes
  6 + */
4 7 function GetAllConsumers() {
5 8 return new Promise(function(resolve, reject) {
6 9 setTimeout(() => {
... ...
package-lock.json
  Diff comments   View file @594fec5
1 1 {
2 2 "name": "GeoSanWeb",
3   - "version": "0.2.1",
  3 + "version": "0.6.2",
4 4 "lockfileVersion": 1,
5 5 "requires": true,
6 6 "dependencies": {
... ... @@ -85,6 +85,11 @@
85 85 "regenerator-runtime": "^0.11.0"
86 86 }
87 87 },
  88 + "balanced-match": {
  89 + "version": "1.0.0",
  90 + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
  91 + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
  92 + },
88 93 "basic-auth": {
89 94 "version": "2.0.0",
90 95 "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.0.tgz",
... ... @@ -129,6 +134,15 @@
129 134 "type-is": "~1.6.15"
130 135 }
131 136 },
  137 + "brace-expansion": {
  138 + "version": "1.1.11",
  139 + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
  140 + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
  141 + "requires": {
  142 + "balanced-match": "^1.0.0",
  143 + "concat-map": "0.0.1"
  144 + }
  145 + },
132 146 "bson": {
133 147 "version": "1.0.6",
134 148 "resolved": "https://registry.npmjs.org/bson/-/bson-1.0.6.tgz",
... ... @@ -223,6 +237,11 @@
223 237 "resolved": "https://registry.npmjs.org/commander/-/commander-2.6.0.tgz",
224 238 "integrity": "sha1-nfflL7Kgyw+4kFjugMMQQiXzfh0="
225 239 },
  240 + "concat-map": {
  241 + "version": "0.0.1",
  242 + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
  243 + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
  244 + },
226 245 "concurrently": {
227 246 "version": "3.5.1",
228 247 "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-3.5.1.tgz",
... ... @@ -372,6 +391,11 @@
372 391 "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
373 392 "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
374 393 },
  394 + "es6-promise": {
  395 + "version": "2.3.0",
  396 + "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-2.3.0.tgz",
  397 + "integrity": "sha1-lu258v2wGZWCKyY92KratnSBgbw="
  398 + },
375 399 "escape-html": {
376 400 "version": "1.0.3",
377 401 "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
... ... @@ -465,16 +489,99 @@
465 489 "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
466 490 "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
467 491 },
  492 + "fs.realpath": {
  493 + "version": "1.0.0",
  494 + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
  495 + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
  496 + },
468 497 "generic-pool": {
469 498 "version": "3.4.2",
470 499 "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-3.4.2.tgz",
471 500 "integrity": "sha512-H7cUpwCQSiJmAHM4c/aFu6fUfrhWXW1ncyh8ftxEPMu6AiYkHw9K8br720TGPZJbk5eOH2bynjZD1yPvdDAmag=="
472 501 },
  502 + "glob": {
  503 + "version": "7.1.2",
  504 + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
  505 + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
  506 + "requires": {
  507 + "fs.realpath": "^1.0.0",
  508 + "inflight": "^1.0.4",
  509 + "inherits": "2",
  510 + "minimatch": "^3.0.4",
  511 + "once": "^1.3.0",
  512 + "path-is-absolute": "^1.0.0"
  513 + }
  514 + },
  515 + "graceful-fs": {
  516 + "version": "3.0.11",
  517 + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz",
  518 + "integrity": "sha1-dhPHeKGv6mLyXGMKCG1/Osu92Bg=",
  519 + "requires": {
  520 + "natives": "^1.1.0"
  521 + }
  522 + },
473 523 "graceful-readlink": {
474 524 "version": "1.0.1",
475 525 "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
476 526 "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU="
477 527 },
  528 + "handlebars": {
  529 + "version": "3.0.3",
  530 + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-3.0.3.tgz",
  531 + "integrity": "sha1-DgllGi8Ps8lJFgWDcQ1VH5Lm0q0=",
  532 + "requires": {
  533 + "optimist": "^0.6.1",
  534 + "source-map": "^0.1.40",
  535 + "uglify-js": "~2.3"
  536 + },
  537 + "dependencies": {
  538 + "async": {
  539 + "version": "0.2.10",
  540 + "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
  541 + "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=",
  542 + "optional": true
  543 + },
  544 + "optimist": {
  545 + "version": "0.6.1",
  546 + "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
  547 + "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
  548 + "requires": {
  549 + "minimist": "~0.0.1",
  550 + "wordwrap": "~0.0.2"
  551 + }
  552 + },
  553 + "source-map": {
  554 + "version": "0.1.43",
  555 + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
  556 + "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
  557 + "requires": {
  558 + "amdefine": ">=0.0.4"
  559 + }
  560 + },
  561 + "uglify-js": {
  562 + "version": "2.3.6",
  563 + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz",
  564 + "integrity": "sha1-+gmEdwtCi3qbKoBY9GNV0U/vIRo=",
  565 + "optional": true,
  566 + "requires": {
  567 + "async": "~0.2.6",
  568 + "optimist": "~0.3.5",
  569 + "source-map": "~0.1.7"
  570 + },
  571 + "dependencies": {
  572 + "optimist": {
  573 + "version": "0.3.7",
  574 + "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz",
  575 + "integrity": "sha1-yQlBrVnkJzMokjB00s8ufLxuwNk=",
  576 + "optional": true,
  577 + "requires": {
  578 + "wordwrap": "~0.0.2"
  579 + }
  580 + }
  581 + }
  582 + }
  583 + }
  584 + },
478 585 "has-ansi": {
479 586 "version": "0.1.0",
480 587 "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
... ... @@ -511,6 +618,15 @@
511 618 "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
512 619 "integrity": "sha1-90aPYBNfXl2tM5nAqBvpoWA6CCs="
513 620 },
  621 + "inflight": {
  622 + "version": "1.0.6",
  623 + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
  624 + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
  625 + "requires": {
  626 + "once": "^1.3.0",
  627 + "wrappy": "1"
  628 + }
  629 + },
514 630 "inherits": {
515 631 "version": "2.0.3",
516 632 "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
... ... @@ -590,6 +706,26 @@
590 706 "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
591 707 "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4="
592 708 },
  709 + "leafdoc": {
  710 + "version": "1.4.1",
  711 + "resolved": "https://registry.npmjs.org/leafdoc/-/leafdoc-1.4.1.tgz",
  712 + "integrity": "sha1-QxDDPZTgZxJSKi0IzTqp2NzVm90=",
  713 + "requires": {
  714 + "handlebars": "^3.0.3",
  715 + "marked": "^0.3.5",
  716 + "minimist": "^1.2.0",
  717 + "sander": "^0.3.8",
  718 + "unicode-7.0.0": "^0.1.5",
  719 + "xregexp": "^2.0.0"
  720 + },
  721 + "dependencies": {
  722 + "minimist": {
  723 + "version": "1.2.0",
  724 + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
  725 + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
  726 + }
  727 + }
  728 + },
593 729 "leaflet-draw": {
594 730 "version": "1.0.2",
595 731 "resolved": "https://registry.npmjs.org/leaflet-draw/-/leaflet-draw-1.0.2.tgz",
... ... @@ -610,6 +746,11 @@
610 746 "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
611 747 "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc="
612 748 },
  749 + "marked": {
  750 + "version": "0.3.19",
  751 + "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.19.tgz",
  752 + "integrity": "sha512-ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg=="
  753 + },
613 754 "media-typer": {
614 755 "version": "0.3.0",
615 756 "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
... ... @@ -643,6 +784,14 @@
643 784 "mime-db": "~1.33.0"
644 785 }
645 786 },
  787 + "minimatch": {
  788 + "version": "3.0.4",
  789 + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
  790 + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
  791 + "requires": {
  792 + "brace-expansion": "^1.1.7"
  793 + }
  794 + },
646 795 "minimist": {
647 796 "version": "0.0.8",
648 797 "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
... ... @@ -756,6 +905,11 @@
756 905 "tedious": "^2.0.0"
757 906 }
758 907 },
  908 + "natives": {
  909 + "version": "1.1.4",
  910 + "resolved": "https://registry.npmjs.org/natives/-/natives-1.1.4.tgz",
  911 + "integrity": "sha512-Q29yeg9aFKwhLVdkTAejM/HvYG0Y1Am1+HUkFQGn5k2j8GS+v60TVmZh6nujpEAj/qql+wGUrlryO8bF+b1jEg=="
  912 + },
759 913 "negotiator": {
760 914 "version": "0.6.1",
761 915 "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
... ... @@ -779,6 +933,14 @@
779 933 "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz",
780 934 "integrity": "sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c="
781 935 },
  936 + "once": {
  937 + "version": "1.4.0",
  938 + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
  939 + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
  940 + "requires": {
  941 + "wrappy": "1"
  942 + }
  943 + },
782 944 "optimist": {
783 945 "version": "0.3.7",
784 946 "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz",
... ... @@ -830,6 +992,11 @@
830 992 "resolved": "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz",
831 993 "integrity": "sha1-tVOaqPwiWj0a0XlHbd8ja0QPUuQ="
832 994 },
  995 + "path-is-absolute": {
  996 + "version": "1.0.1",
  997 + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
  998 + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
  999 + },
833 1000 "path-to-regexp": {
834 1001 "version": "0.1.7",
835 1002 "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
... ... @@ -1017,6 +1184,14 @@
1017 1184 "align-text": "^0.1.1"
1018 1185 }
1019 1186 },
  1187 + "rimraf": {
  1188 + "version": "2.6.2",
  1189 + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
  1190 + "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
  1191 + "requires": {
  1192 + "glob": "^7.0.5"
  1193 + }
  1194 + },
1020 1195 "rx": {
1021 1196 "version": "2.3.24",
1022 1197 "resolved": "https://registry.npmjs.org/rx/-/rx-2.3.24.tgz",
... ... @@ -1027,6 +1202,17 @@
1027 1202 "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
1028 1203 "integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM="
1029 1204 },
  1205 + "sander": {
  1206 + "version": "0.3.8",
  1207 + "resolved": "https://registry.npmjs.org/sander/-/sander-0.3.8.tgz",
  1208 + "integrity": "sha1-cpf95zlhkv6d3IHsZVijvNNdJNU=",
  1209 + "requires": {
  1210 + "es6-promise": "^2.0.0",
  1211 + "graceful-fs": "^3.0.4",
  1212 + "mkdirp": "^0.5.0",
  1213 + "rimraf": "^2.2.8"
  1214 + }
  1215 + },
1030 1216 "semver": {
1031 1217 "version": "5.5.0",
1032 1218 "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
... ... @@ -1287,6 +1473,11 @@
1287 1473 "resolved": "https://registry.npmjs.org/uid2/-/uid2-0.0.3.tgz",
1288 1474 "integrity": "sha1-SDEm4Rd03y9xuLY53NeZw3YWK4I="
1289 1475 },
  1476 + "unicode-7.0.0": {
  1477 + "version": "0.1.6",
  1478 + "resolved": "https://registry.npmjs.org/unicode-7.0.0/-/unicode-7.0.0-0.1.6.tgz",
  1479 + "integrity": "sha1-eeZtk98D7MGSZyFVf0Ny0ZPKXqw="
  1480 + },
1290 1481 "unpipe": {
1291 1482 "version": "1.0.0",
1292 1483 "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
... ... @@ -1338,6 +1529,16 @@
1338 1529 "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
1339 1530 "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc="
1340 1531 },
  1532 + "wrappy": {
  1533 + "version": "1.0.2",
  1534 + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
  1535 + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
  1536 + },
  1537 + "xregexp": {
  1538 + "version": "2.0.0",
  1539 + "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz",
  1540 + "integrity": "sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM="
  1541 + },
1341 1542 "xtend": {
1342 1543 "version": "4.0.1",
1343 1544 "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
... ...
package.json
  Diff comments   View file @594fec5
... ... @@ -24,6 +24,7 @@
24 24 "express": "~4.15.5",
25 25 "jade": "~1.11.0",
26 26 "jade-bootstrap": "^1.0.14",
  27 + "leafdoc": "^1.4.1",
27 28 "leaflet-draw": "^1.0.2",
28 29 "mongoose": "^5.1.0",
29 30 "morgan": "~1.9.0",
... ...