From ef6b62eea066dda566d88715bab5f338f00447c8 Mon Sep 17 00:00:00 2001
From: Erik Lindsay
Date: Sat, 25 Mar 2017 15:14:42 -0400
Subject: [PATCH] location works
---
Wello/platforms/browser/cordova/build | 0
Wello/platforms/browser/cordova/clean | 0
.../node_modules/content-disposition/index.js | 445 ----------
.../express/node_modules/cookie/index.js | 156 ----
Wello/platforms/browser/cordova/run | 0
Wello/platforms/browser/cordova/version | 0
html-ONLY-site/form.html | 5 +-
html-ONLY-site/index.html | 17 +-
html-ONLY-site/js/main.js | 17 +
html-ONLY-site/{map.html => map.php} | 17 +
html-site/css/main (1).css | 838 +++++++++---------
html-site/test.html | 29 +
12 files changed, 489 insertions(+), 1035 deletions(-)
mode change 100755 => 100644 Wello/platforms/browser/cordova/build
mode change 100755 => 100644 Wello/platforms/browser/cordova/clean
delete mode 100644 Wello/platforms/browser/cordova/node_modules/cordova-serve/node_modules/express/node_modules/content-disposition/index.js
delete mode 100644 Wello/platforms/browser/cordova/node_modules/cordova-serve/node_modules/express/node_modules/cookie/index.js
mode change 100755 => 100644 Wello/platforms/browser/cordova/run
mode change 100755 => 100644 Wello/platforms/browser/cordova/version
rename html-ONLY-site/{map.html => map.php} (90%)
create mode 100644 html-site/test.html
diff --git a/Wello/platforms/browser/cordova/build b/Wello/platforms/browser/cordova/build
old mode 100755
new mode 100644
diff --git a/Wello/platforms/browser/cordova/clean b/Wello/platforms/browser/cordova/clean
old mode 100755
new mode 100644
diff --git a/Wello/platforms/browser/cordova/node_modules/cordova-serve/node_modules/express/node_modules/content-disposition/index.js b/Wello/platforms/browser/cordova/node_modules/cordova-serve/node_modules/express/node_modules/content-disposition/index.js
deleted file mode 100644
index 4a352dc..0000000
--- a/Wello/platforms/browser/cordova/node_modules/cordova-serve/node_modules/express/node_modules/content-disposition/index.js
+++ /dev/null
@@ -1,445 +0,0 @@
-/*!
- * content-disposition
- * Copyright(c) 2014 Douglas Christopher Wilson
- * MIT Licensed
- */
-
-'use strict'
-
-/**
- * Module exports.
- */
-
-module.exports = contentDisposition
-module.exports.parse = parse
-
-/**
- * Module dependencies.
- */
-
-var basename = require('path').basename
-
-/**
- * RegExp to match non attr-char, *after* encodeURIComponent (i.e. not including "%")
- */
-
-var encodeUriAttrCharRegExp = /[\x00-\x20"'\(\)*,\/:;<=>?@\[\\\]\{\}\x7f]/g
-
-/**
- * RegExp to match percent encoding escape.
- */
-
-var hexEscapeRegExp = /%[0-9A-Fa-f]{2}/
-var hexEscapeReplaceRegExp = /%([0-9A-Fa-f]{2})/g
-
-/**
- * RegExp to match non-latin1 characters.
- */
-
-var nonLatin1RegExp = /[^\x20-\x7e\xa0-\xff]/g
-
-/**
- * RegExp to match quoted-pair in RFC 2616
- *
- * quoted-pair = "\" CHAR
- * CHAR =
- */
-
-var qescRegExp = /\\([\u0000-\u007f])/g;
-
-/**
- * RegExp to match chars that must be quoted-pair in RFC 2616
- */
-
-var quoteRegExp = /([\\"])/g
-
-/**
- * RegExp for various RFC 2616 grammar
- *
- * parameter = token "=" ( token | quoted-string )
- * token = 1*
- * separators = "(" | ")" | "<" | ">" | "@"
- * | "," | ";" | ":" | "\" | <">
- * | "/" | "[" | "]" | "?" | "="
- * | "{" | "}" | SP | HT
- * quoted-string = ( <"> *(qdtext | quoted-pair ) <"> )
- * qdtext = >
- * quoted-pair = "\" CHAR
- * CHAR =
- * TEXT =
- * LWS = [CRLF] 1*( SP | HT )
- * CRLF = CR LF
- * CR =
- * LF =
- * SP =
- * HT =
- * CTL =
- * OCTET =
- */
-
-var paramRegExp = /; *([!#$%&'\*\+\-\.0-9A-Z\^_`a-z\|~]+) *= *("(?:[ !\x23-\x5b\x5d-\x7e\x80-\xff]|\\[\x20-\x7e])*"|[!#$%&'\*\+\-\.0-9A-Z\^_`a-z\|~]+) */g
-var textRegExp = /^[\x20-\x7e\x80-\xff]+$/
-var tokenRegExp = /^[!#$%&'\*\+\-\.0-9A-Z\^_`a-z\|~]+$/
-
-/**
- * RegExp for various RFC 5987 grammar
- *
- * ext-value = charset "'" [ language ] "'" value-chars
- * charset = "UTF-8" / "ISO-8859-1" / mime-charset
- * mime-charset = 1*mime-charsetc
- * mime-charsetc = ALPHA / DIGIT
- * / "!" / "#" / "$" / "%" / "&"
- * / "+" / "-" / "^" / "_" / "`"
- * / "{" / "}" / "~"
- * language = ( 2*3ALPHA [ extlang ] )
- * / 4ALPHA
- * / 5*8ALPHA
- * extlang = *3( "-" 3ALPHA )
- * value-chars = *( pct-encoded / attr-char )
- * pct-encoded = "%" HEXDIG HEXDIG
- * attr-char = ALPHA / DIGIT
- * / "!" / "#" / "$" / "&" / "+" / "-" / "."
- * / "^" / "_" / "`" / "|" / "~"
- */
-
-var extValueRegExp = /^([A-Za-z0-9!#$%&+\-^_`{}~]+)'(?:[A-Za-z]{2,3}(?:-[A-Za-z]{3}){0,3}|[A-Za-z]{4,8}|)'((?:%[0-9A-Fa-f]{2}|[A-Za-z0-9!#$&+\-\.^_`|~])+)$/
-
-/**
- * RegExp for various RFC 6266 grammar
- *
- * disposition-type = "inline" | "attachment" | disp-ext-type
- * disp-ext-type = token
- * disposition-parm = filename-parm | disp-ext-parm
- * filename-parm = "filename" "=" value
- * | "filename*" "=" ext-value
- * disp-ext-parm = token "=" value
- * | ext-token "=" ext-value
- * ext-token =
- */
-
-var dispositionTypeRegExp = /^([!#$%&'\*\+\-\.0-9A-Z\^_`a-z\|~]+) *(?:$|;)/
-
-/**
- * Create an attachment Content-Disposition header.
- *
- * @param {string} [filename]
- * @param {object} [options]
- * @param {string} [options.type=attachment]
- * @param {string|boolean} [options.fallback=true]
- * @return {string}
- * @api public
- */
-
-function contentDisposition(filename, options) {
- var opts = options || {}
-
- // get type
- var type = opts.type || 'attachment'
-
- // get parameters
- var params = createparams(filename, opts.fallback)
-
- // format into string
- return format(new ContentDisposition(type, params))
-}
-
-/**
- * Create parameters object from filename and fallback.
- *
- * @param {string} [filename]
- * @param {string|boolean} [fallback=true]
- * @return {object}
- * @api private
- */
-
-function createparams(filename, fallback) {
- if (filename === undefined) {
- return
- }
-
- var params = {}
-
- if (typeof filename !== 'string') {
- throw new TypeError('filename must be a string')
- }
-
- // fallback defaults to true
- if (fallback === undefined) {
- fallback = true
- }
-
- if (typeof fallback !== 'string' && typeof fallback !== 'boolean') {
- throw new TypeError('fallback must be a string or boolean')
- }
-
- if (typeof fallback === 'string' && nonLatin1RegExp.test(fallback)) {
- throw new TypeError('fallback must be ISO-8859-1 string')
- }
-
- // restrict to file base name
- var name = basename(filename)
-
- // determine if name is suitable for quoted string
- var isQuotedString = textRegExp.test(name)
-
- // generate fallback name
- var fallbackName = typeof fallback !== 'string'
- ? fallback && getlatin1(name)
- : basename(fallback)
- var hasFallback = typeof fallbackName === 'string' && fallbackName !== name
-
- // set extended filename parameter
- if (hasFallback || !isQuotedString || hexEscapeRegExp.test(name)) {
- params['filename*'] = name
- }
-
- // set filename parameter
- if (isQuotedString || hasFallback) {
- params.filename = hasFallback
- ? fallbackName
- : name
- }
-
- return params
-}
-
-/**
- * Format object to Content-Disposition header.
- *
- * @param {object} obj
- * @param {string} obj.type
- * @param {object} [obj.parameters]
- * @return {string}
- * @api private
- */
-
-function format(obj) {
- var parameters = obj.parameters
- var type = obj.type
-
- if (!type || typeof type !== 'string' || !tokenRegExp.test(type)) {
- throw new TypeError('invalid type')
- }
-
- // start with normalized type
- var string = String(type).toLowerCase()
-
- // append parameters
- if (parameters && typeof parameters === 'object') {
- var param
- var params = Object.keys(parameters).sort()
-
- for (var i = 0; i < params.length; i++) {
- param = params[i]
-
- var val = param.substr(-1) === '*'
- ? ustring(parameters[param])
- : qstring(parameters[param])
-
- string += '; ' + param + '=' + val
- }
- }
-
- return string
-}
-
-/**
- * Decode a RFC 6987 field value (gracefully).
- *
- * @param {string} str
- * @return {string}
- * @api private
- */
-
-function decodefield(str) {
- var match = extValueRegExp.exec(str)
-
- if (!match) {
- throw new TypeError('invalid extended field value')
- }
-
- var charset = match[1].toLowerCase()
- var encoded = match[2]
- var value
-
- // to binary string
- var binary = encoded.replace(hexEscapeReplaceRegExp, pdecode)
-
- switch (charset) {
- case 'iso-8859-1':
- value = getlatin1(binary)
- break
- case 'utf-8':
- value = new Buffer(binary, 'binary').toString('utf8')
- break
- default:
- throw new TypeError('unsupported charset in extended field')
- }
-
- return value
-}
-
-/**
- * Get ISO-8859-1 version of string.
- *
- * @param {string} val
- * @return {string}
- * @api private
- */
-
-function getlatin1(val) {
- // simple Unicode -> ISO-8859-1 transformation
- return String(val).replace(nonLatin1RegExp, '?')
-}
-
-/**
- * Parse Content-Disposition header string.
- *
- * @param {string} string
- * @return {object}
- * @api private
- */
-
-function parse(string) {
- if (!string || typeof string !== 'string') {
- throw new TypeError('argument string is required')
- }
-
- var match = dispositionTypeRegExp.exec(string)
-
- if (!match) {
- throw new TypeError('invalid type format')
- }
-
- // normalize type
- var index = match[0].length
- var type = match[1].toLowerCase()
-
- var key
- var names = []
- var params = {}
- var value
-
- // calculate index to start at
- index = paramRegExp.lastIndex = match[0].substr(-1) === ';'
- ? index - 1
- : index
-
- // match parameters
- while (match = paramRegExp.exec(string)) {
- if (match.index !== index) {
- throw new TypeError('invalid parameter format')
- }
-
- index += match[0].length
- key = match[1].toLowerCase()
- value = match[2]
-
- if (names.indexOf(key) !== -1) {
- throw new TypeError('invalid duplicate parameter')
- }
-
- names.push(key)
-
- if (key.indexOf('*') + 1 === key.length) {
- // decode extended value
- key = key.slice(0, -1)
- value = decodefield(value)
-
- // overwrite existing value
- params[key] = value
- continue
- }
-
- if (typeof params[key] === 'string') {
- continue
- }
-
- if (value[0] === '"') {
- // remove quotes and escapes
- value = value
- .substr(1, value.length - 2)
- .replace(qescRegExp, '$1')
- }
-
- params[key] = value
- }
-
- if (index !== -1 && index !== string.length) {
- throw new TypeError('invalid parameter format')
- }
-
- return new ContentDisposition(type, params)
-}
-
-/**
- * Percent decode a single character.
- *
- * @param {string} str
- * @param {string} hex
- * @return {string}
- * @api private
- */
-
-function pdecode(str, hex) {
- return String.fromCharCode(parseInt(hex, 16))
-}
-
-/**
- * Percent encode a single character.
- *
- * @param {string} char
- * @return {string}
- * @api private
- */
-
-function pencode(char) {
- var hex = String(char)
- .charCodeAt(0)
- .toString(16)
- .toUpperCase()
- return hex.length === 1
- ? '%0' + hex
- : '%' + hex
-}
-
-/**
- * Quote a string for HTTP.
- *
- * @param {string} val
- * @return {string}
- * @api private
- */
-
-function qstring(val) {
- var str = String(val)
-
- return '"' + str.replace(quoteRegExp, '\\$1') + '"'
-}
-
-/**
- * Encode a Unicode string for HTTP (RFC 5987).
- *
- * @param {string} val
- * @return {string}
- * @api private
- */
-
-function ustring(val) {
- var str = String(val)
-
- // percent encode as UTF-8
- var encoded = encodeURIComponent(str)
- .replace(encodeUriAttrCharRegExp, pencode)
-
- return 'UTF-8\'\'' + encoded
-}
-
-/**
- * Class for parsed Content-Disposition header for v8 optimization
- */
-
-function ContentDisposition(type, parameters) {
- this.type = type
- this.parameters = parameters
-}
diff --git a/Wello/platforms/browser/cordova/node_modules/cordova-serve/node_modules/express/node_modules/cookie/index.js b/Wello/platforms/browser/cordova/node_modules/cordova-serve/node_modules/express/node_modules/cookie/index.js
deleted file mode 100644
index b705b2c..0000000
--- a/Wello/platforms/browser/cordova/node_modules/cordova-serve/node_modules/express/node_modules/cookie/index.js
+++ /dev/null
@@ -1,156 +0,0 @@
-/*!
- * cookie
- * Copyright(c) 2012-2014 Roman Shtylman
- * Copyright(c) 2015 Douglas Christopher Wilson
- * MIT Licensed
- */
-
-/**
- * Module exports.
- * @public
- */
-
-exports.parse = parse;
-exports.serialize = serialize;
-
-/**
- * Module variables.
- * @private
- */
-
-var decode = decodeURIComponent;
-var encode = encodeURIComponent;
-
-/**
- * RegExp to match field-content in RFC 7230 sec 3.2
- *
- * field-content = field-vchar [ 1*( SP / HTAB ) field-vchar ]
- * field-vchar = VCHAR / obs-text
- * obs-text = %x80-FF
- */
-
-var fieldContentRegExp = /^[\u0009\u0020-\u007e\u0080-\u00ff]+$/;
-
-/**
- * Parse a cookie header.
- *
- * Parse the given cookie header string into an object
- * The object has the various cookies as keys(names) => values
- *
- * @param {string} str
- * @param {object} [options]
- * @return {object}
- * @public
- */
-
-function parse(str, options) {
- if (typeof str !== 'string') {
- throw new TypeError('argument str must be a string');
- }
-
- var obj = {}
- var opt = options || {};
- var pairs = str.split(/; */);
- var dec = opt.decode || decode;
-
- pairs.forEach(function(pair) {
- var eq_idx = pair.indexOf('=')
-
- // skip things that don't look like key=value
- if (eq_idx < 0) {
- return;
- }
-
- var key = pair.substr(0, eq_idx).trim()
- var val = pair.substr(++eq_idx, pair.length).trim();
-
- // quoted values
- if ('"' == val[0]) {
- val = val.slice(1, -1);
- }
-
- // only assign once
- if (undefined == obj[key]) {
- obj[key] = tryDecode(val, dec);
- }
- });
-
- return obj;
-}
-
-/**
- * Serialize data into a cookie header.
- *
- * Serialize the a name value pair into a cookie string suitable for
- * http headers. An optional options object specified cookie parameters.
- *
- * serialize('foo', 'bar', { httpOnly: true })
- * => "foo=bar; httpOnly"
- *
- * @param {string} name
- * @param {string} val
- * @param {object} [options]
- * @return {string}
- * @public
- */
-
-function serialize(name, val, options) {
- var opt = options || {};
- var enc = opt.encode || encode;
-
- if (!fieldContentRegExp.test(name)) {
- throw new TypeError('argument name is invalid');
- }
-
- var value = enc(val);
-
- if (value && !fieldContentRegExp.test(value)) {
- throw new TypeError('argument val is invalid');
- }
-
- var pairs = [name + '=' + value];
-
- if (null != opt.maxAge) {
- var maxAge = opt.maxAge - 0;
- if (isNaN(maxAge)) throw new Error('maxAge should be a Number');
- pairs.push('Max-Age=' + maxAge);
- }
-
- if (opt.domain) {
- if (!fieldContentRegExp.test(opt.domain)) {
- throw new TypeError('option domain is invalid');
- }
-
- pairs.push('Domain=' + opt.domain);
- }
-
- if (opt.path) {
- if (!fieldContentRegExp.test(opt.path)) {
- throw new TypeError('option path is invalid');
- }
-
- pairs.push('Path=' + opt.path);
- }
-
- if (opt.expires) pairs.push('Expires=' + opt.expires.toUTCString());
- if (opt.httpOnly) pairs.push('HttpOnly');
- if (opt.secure) pairs.push('Secure');
-
- return pairs.join('; ');
-}
-
-/**
- * Try decoding a string using a decoding function.
- *
- * @param {string} str
- * @param {function} decode
- * @private
- */
-
-function tryDecode(str, decode) {
- try {
- return decode(str);
- } catch (e) {
- return str;
- }
-}
diff --git a/Wello/platforms/browser/cordova/run b/Wello/platforms/browser/cordova/run
old mode 100755
new mode 100644
diff --git a/Wello/platforms/browser/cordova/version b/Wello/platforms/browser/cordova/version
old mode 100755
new mode 100644
diff --git a/html-ONLY-site/form.html b/html-ONLY-site/form.html
index 1039649..c357a4f 100644
--- a/html-ONLY-site/form.html
+++ b/html-ONLY-site/form.html
@@ -117,7 +117,10 @@ Well location
-
+
+
diff --git a/html-ONLY-site/index.html b/html-ONLY-site/index.html
index 5a78ecc..e6c41ea 100644
--- a/html-ONLY-site/index.html
+++ b/html-ONLY-site/index.html
@@ -15,33 +15,22 @@
-
-
-
-
-
-
-
-
-
-
+
Connecticut
Well Report App
Use this app to pull up data on any well in Connecticut on site and see it's details. Also, fill out and submit well report forms within the app.
Continue
+
-
-
-
-
+
-
-
-
-Location Relative To Landmarks
- Insert description here
-
-
-
-
Use :
-
where to use
-
-
-
-
-
Drilling Equipment:
-
Write what equipment was used
-
-
- Casing details
-
- Length: insert length here
- Diameter: insert here
- Weight per foot: insert here
- Drive Shoe: insert here
- Threaded: insert here
- Was Casing Grouted: insert here
-
- Yeild Test
-
- Methods: insert here
- Duration: insert here
- Yield: insert here
-
-Write down the yeild here with same format as above
-
-
- Water Level
-
- From Land to Surface: insert here
- During Yeild Test: insert here
- Depth of Completed Well: insert here
-
-
- Screen Details
-
- Make: insert here
- Length Open To Aquilfier: insert here
- Slot Size: insert here
- Diameter: insert here
- Gravel: insert here
- Diameter Including Gravel Pack: insert here
- Gravel Size: insert here
- Gravel Pack Location: insert here
-
- Depth from land to surface
-
- We must find a way to iterate based on the value in the submit form
-
-
-
-
-
-
-
-