-
Notifications
You must be signed in to change notification settings - Fork 0
/
tmp_big.diff
518 lines (502 loc) · 17.5 KB
/
tmp_big.diff
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
diff --git a/Client_SAR/platforms/browser/www/View_02.html b/Client_SAR/platforms/browser/www/View_02.html
index a717fff..9de1c6b 100644
--- a/Client_SAR/platforms/browser/www/View_02.html
+++ b/Client_SAR/platforms/browser/www/View_02.html
@@ -11,9 +11,11 @@
</tr>
</table>
</div>
-<div id="image_disp" class="hidden">
-<img id="image_ghost" onload="check_size();">
-<div id="debug_dom">Debug</div>
+<div id="dialog_2_2" class="full">
+ <img id="image_disp">
+ <div class="plazhalter"></div>
+ <input id="title_input" type="text" value="Title">
+</div>
<script>
diff --git a/Client_SAR/platforms/browser/www/css/main.css b/Client_SAR/platforms/browser/www/css/main.css
index dbdc6ee..06d168f 100644
--- a/Client_SAR/platforms/browser/www/css/main.css
+++ b/Client_SAR/platforms/browser/www/css/main.css
@@ -86,12 +86,26 @@ h1 {
}
#image_disp {
- background-image: url();
- background-size: cover;
- position: fixed;
+ position: absolute;
top: 0px;
left: 0px;
- width: 600px;
+}
+
+#title_input {
+ position: relative;
+ padding: 0;
+ margin: 0;
+ width: 95%;
+ text-align: center;
+ font-size: 50pt;
+ bottom: 0;
+ background-color: rgba(0,0,0,0);
+ border: none;
+}
+
+.plazhalter {
+ height: 70%;
+ width: 100%;
}
.positive{
diff --git a/Client_SAR/platforms/browser/www/js/camera.js b/Client_SAR/platforms/browser/www/js/camera.js
index b63a929..aea5ecd 100644
--- a/Client_SAR/platforms/browser/www/js/camera.js
+++ b/Client_SAR/platforms/browser/www/js/camera.js
@@ -16,12 +16,12 @@ function init_camera() {
function onPhotoDataSuccess(imageData) {
// Get image handle
//
- var smallImage = document.getElementById("image_ghost");
+ var smallImage = document.getElementById("image_disp");
// Unhide image elements
// Show the captured photo
// The inline CSS rules are used to resize the image
smallImage.src = "data:image/jpeg;base64," + imageData;
- $('#' + result_disp).css('background-image', 'url(data:image/jpeg;base64,' + imageData + ')');
+ $('#image_disp').width($(window).width() + "px");
result_cb();
}
@@ -33,17 +33,15 @@ function onPhotoFileSuccess(imageData) {
// Get image handle
//
- var smallImage = document.getElementById('image_ghost');
+ var smallImage = document.getElementById('image_disp');
// Unhide image elements
//
//smallImage.style.display = 'block';
// Show the captured photo
// The inline CSS rules are used to resize the image
//
- smallImage.src = imageData;
- $('#' + result_disp).css('background-image', 'url(' + imageData + ')');
- $('#' + result_disp).css("width", $(window).width() + "px");
- $('#' + result_disp).css("height", $(window).width() * 1.333333333333 + "px");
+ smallImage.src = "" + imageData;
+ $('#image_disp').width($(window).width() + "px");
result_cb();
//$('#' + result_disp).css('background-image', 'url(' + imageData + ')');
}
diff --git a/Client_SAR/platforms/browser/www/js/navigator.js b/Client_SAR/platforms/browser/www/js/navigator.js
index caf5c4d..9246b46 100644
--- a/Client_SAR/platforms/browser/www/js/navigator.js
+++ b/Client_SAR/platforms/browser/www/js/navigator.js
@@ -2,11 +2,13 @@ var active_view = 0;
var view_history = [];
function load_view(nr) {
- $('#View_0'+active_view).hide();
+ var layer = nr > 9 ? "#View_" + nr : "#View_0" + nr;
+ var layer_a = nr > 9 ? "#View_" + active_view : "#View_0" + active_view;
+ $(layer_a).hide();
view_history.push(active_view);
- $('#View_0'+nr).show();
- if ($("#View_0"+nr).html() == "") {
- $("#View_0"+nr).load("View_0"+nr+".html");
+ $(layer).show();
+ if ($(layer_a).html() == "") {
+ $(layer).load(layer+".html");
}
active_view = nr;
}
diff --git a/Client_SAR/www/View_02.html b/Client_SAR/www/View_02.html
index a717fff..9de1c6b 100644
--- a/Client_SAR/www/View_02.html
+++ b/Client_SAR/www/View_02.html
@@ -11,9 +11,11 @@
</tr>
</table>
</div>
-<div id="image_disp" class="hidden">
-<img id="image_ghost" onload="check_size();">
-<div id="debug_dom">Debug</div>
+<div id="dialog_2_2" class="full">
+ <img id="image_disp">
+ <div class="plazhalter"></div>
+ <input id="title_input" type="text" value="Title">
+</div>
<script>
diff --git a/Client_SAR/www/css/main.css b/Client_SAR/www/css/main.css
index dbdc6ee..06d168f 100644
--- a/Client_SAR/www/css/main.css
+++ b/Client_SAR/www/css/main.css
@@ -86,12 +86,26 @@ h1 {
}
#image_disp {
- background-image: url();
- background-size: cover;
- position: fixed;
+ position: absolute;
top: 0px;
left: 0px;
- width: 600px;
+}
+
+#title_input {
+ position: relative;
+ padding: 0;
+ margin: 0;
+ width: 95%;
+ text-align: center;
+ font-size: 50pt;
+ bottom: 0;
+ background-color: rgba(0,0,0,0);
+ border: none;
+}
+
+.plazhalter {
+ height: 70%;
+ width: 100%;
}
.positive{
diff --git a/Client_SAR/www/js/camera.js b/Client_SAR/www/js/camera.js
index b63a929..aea5ecd 100644
--- a/Client_SAR/www/js/camera.js
+++ b/Client_SAR/www/js/camera.js
@@ -16,12 +16,12 @@ function init_camera() {
function onPhotoDataSuccess(imageData) {
// Get image handle
//
- var smallImage = document.getElementById("image_ghost");
+ var smallImage = document.getElementById("image_disp");
// Unhide image elements
// Show the captured photo
// The inline CSS rules are used to resize the image
smallImage.src = "data:image/jpeg;base64," + imageData;
- $('#' + result_disp).css('background-image', 'url(data:image/jpeg;base64,' + imageData + ')');
+ $('#image_disp').width($(window).width() + "px");
result_cb();
}
@@ -33,17 +33,15 @@ function onPhotoFileSuccess(imageData) {
// Get image handle
//
- var smallImage = document.getElementById('image_ghost');
+ var smallImage = document.getElementById('image_disp');
// Unhide image elements
//
//smallImage.style.display = 'block';
// Show the captured photo
// The inline CSS rules are used to resize the image
//
- smallImage.src = imageData;
- $('#' + result_disp).css('background-image', 'url(' + imageData + ')');
- $('#' + result_disp).css("width", $(window).width() + "px");
- $('#' + result_disp).css("height", $(window).width() * 1.333333333333 + "px");
+ smallImage.src = "" + imageData;
+ $('#image_disp').width($(window).width() + "px");
result_cb();
//$('#' + result_disp).css('background-image', 'url(' + imageData + ')');
}
diff --git a/Server_SAR/node_modules/core-util-is/package.json b/Server_SAR/node_modules/core-util-is/package.json
index 365451e..a2593e5 100644
--- a/Server_SAR/node_modules/core-util-is/package.json
+++ b/Server_SAR/node_modules/core-util-is/package.json
@@ -21,7 +21,7 @@
"_resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
"_shasum": "b5fd54220aa2bc5ab57aab7140c940754503c1a7",
"_spec": "core-util-is@~1.0.0",
- "_where": "/Users/sebastian/Coding/Junction/StoreAndRecycle/Server_SAR/node_modules/readable-stream",
+ "_where": "/home/leenr/Junction-2017/sio-mqtt/node_modules/readable-stream",
"author": {
"name": "Isaac Z. Schlueter",
"email": "[email protected]",
diff --git a/Server_SAR/node_modules/graceful-fs/package.json b/Server_SAR/node_modules/graceful-fs/package.json
index 891089c..f98b87f 100644
--- a/Server_SAR/node_modules/graceful-fs/package.json
+++ b/Server_SAR/node_modules/graceful-fs/package.json
@@ -1,5 +1,5 @@
{
- "_from": "graceful-fs@^4.1.6",
+ "_from": "graceful-fs@^4.1.2",
"_id": "[email protected]",
"_inBundle": false,
"_integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
@@ -8,20 +8,24 @@
"_requested": {
"type": "range",
"registry": true,
- "raw": "graceful-fs@^4.1.6",
+ "raw": "graceful-fs@^4.1.2",
"name": "graceful-fs",
"escapedName": "graceful-fs",
- "rawSpec": "^4.1.6",
+ "rawSpec": "^4.1.2",
"saveSpec": null,
- "fetchSpec": "^4.1.6"
+ "fetchSpec": "^4.1.2"
},
"_requiredBy": [
- "/jsonfile"
+ "/fstream",
+ "/node-gyp",
+ "/node-ninja",
+ "/qlobber-fsq",
+ "/st"
],
"_resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
"_shasum": "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658",
- "_spec": "graceful-fs@^4.1.6",
- "_where": "/Users/sebastian/Coding/Junction/StoreAndRecycle/Server_SAR/node_modules/jsonfile",
+ "_spec": "graceful-fs@^4.1.2",
+ "_where": "/home/leenr/Junction-2017/sio-mqtt/node_modules/node-gyp",
"bugs": {
"url": "https://github.com/isaacs/node-graceful-fs/issues"
},
diff --git a/Server_SAR/node_modules/inherits/package.json b/Server_SAR/node_modules/inherits/package.json
index 7467a83..9f425df 100644
--- a/Server_SAR/node_modules/inherits/package.json
+++ b/Server_SAR/node_modules/inherits/package.json
@@ -1,5 +1,5 @@
{
- "_from": "inherits@~2.0.3",
+ "_from": "inherits@^2.0.3",
"_id": "[email protected]",
"_inBundle": false,
"_integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
@@ -8,20 +8,28 @@
"_requested": {
"type": "range",
"registry": true,
- "raw": "inherits@~2.0.3",
+ "raw": "inherits@^2.0.3",
"name": "inherits",
"escapedName": "inherits",
- "rawSpec": "~2.0.3",
+ "rawSpec": "^2.0.3",
"saveSpec": null,
- "fetchSpec": "~2.0.3"
+ "fetchSpec": "^2.0.3"
},
"_requiredBy": [
- "/readable-stream"
+ "/callback-stream",
+ "/concat-stream",
+ "/duplexify",
+ "/glob",
+ "/mqtt",
+ "/mqtt-packet",
+ "/pumpify",
+ "/readable-stream",
+ "/websocket-stream"
],
"_resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
"_shasum": "633c2c83e3da42a502f52466022480f4208261de",
- "_spec": "inherits@~2.0.3",
- "_where": "/Users/sebastian/Coding/Junction/StoreAndRecycle/Server_SAR/node_modules/readable-stream",
+ "_spec": "inherits@^2.0.3",
+ "_where": "/home/leenr/Junction-2017/sio-mqtt/node_modules/mqtt",
"browser": "./inherits_browser.js",
"bugs": {
"url": "https://github.com/isaacs/inherits/issues"
diff --git a/Server_SAR/node_modules/isarray/package.json b/Server_SAR/node_modules/isarray/package.json
index 4b4dbfb..1fad6a3 100644
--- a/Server_SAR/node_modules/isarray/package.json
+++ b/Server_SAR/node_modules/isarray/package.json
@@ -21,7 +21,7 @@
"_resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
"_shasum": "bb935d48582cba168c06834957a54a3e07124f11",
"_spec": "isarray@~1.0.0",
- "_where": "/Users/sebastian/Coding/Junction/StoreAndRecycle/Server_SAR/node_modules/readable-stream",
+ "_where": "/home/leenr/Junction-2017/sio-mqtt/node_modules/readable-stream",
"author": {
"name": "Julian Gruber",
"email": "[email protected]",
diff --git a/Server_SAR/node_modules/process-nextick-args/package.json b/Server_SAR/node_modules/process-nextick-args/package.json
index 533199e..0391fd8 100644
--- a/Server_SAR/node_modules/process-nextick-args/package.json
+++ b/Server_SAR/node_modules/process-nextick-args/package.json
@@ -16,12 +16,13 @@
"fetchSpec": "~1.0.6"
},
"_requiredBy": [
+ "/mqtt-packet",
"/readable-stream"
],
"_resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
"_shasum": "150e20b756590ad3f91093f25a4f2ad8bff30ba3",
"_spec": "process-nextick-args@~1.0.6",
- "_where": "/Users/sebastian/Coding/Junction/StoreAndRecycle/Server_SAR/node_modules/readable-stream",
+ "_where": "/home/leenr/Junction-2017/sio-mqtt/node_modules/readable-stream",
"author": "",
"bugs": {
"url": "https://github.com/calvinmetcalf/process-nextick-args/issues"
diff --git a/Server_SAR/node_modules/readable-stream/package.json b/Server_SAR/node_modules/readable-stream/package.json
index eb8bf53..4bbaf87 100644
--- a/Server_SAR/node_modules/readable-stream/package.json
+++ b/Server_SAR/node_modules/readable-stream/package.json
@@ -1,27 +1,35 @@
{
- "_from": "[email protected]",
+ "_from": "readable-stream@^2.3.3",
"_id": "[email protected]",
"_inBundle": false,
"_integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
"_location": "/readable-stream",
"_phantomChildren": {},
"_requested": {
- "type": "version",
+ "type": "range",
"registry": true,
- "raw": "[email protected]",
+ "raw": "readable-stream@^2.3.3",
"name": "readable-stream",
"escapedName": "readable-stream",
- "rawSpec": "2.3.3",
+ "rawSpec": "^2.3.3",
"saveSpec": null,
- "fetchSpec": "2.3.3"
+ "fetchSpec": "^2.3.3"
},
"_requiredBy": [
- "/mysql"
+ "/bl",
+ "/callback-stream",
+ "/concat-stream",
+ "/duplexify",
+ "/glob-stream",
+ "/mqtt",
+ "/ordered-read-streams",
+ "/through2",
+ "/websocket-stream"
],
"_resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
"_shasum": "368f2512d79f9d46fdfc71349ae7878bbc1eb95c",
- "_spec": "[email protected]",
- "_where": "/Users/sebastian/Coding/Junction/StoreAndRecycle/Server_SAR/node_modules/mysql",
+ "_spec": "readable-stream@^2.3.3",
+ "_where": "/home/leenr/Junction-2017/sio-mqtt/node_modules/mqtt",
"browser": {
"util": false,
"./readable.js": "./readable-browser.js",
diff --git a/Server_SAR/node_modules/safe-buffer/package.json b/Server_SAR/node_modules/safe-buffer/package.json
index 00a914f..0ee85c3 100644
--- a/Server_SAR/node_modules/safe-buffer/package.json
+++ b/Server_SAR/node_modules/safe-buffer/package.json
@@ -1,29 +1,31 @@
{
- "_from": "[email protected]",
+ "_from": "safe-buffer@~5.1.1",
"_id": "[email protected]",
"_inBundle": false,
"_integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
"_location": "/safe-buffer",
"_phantomChildren": {},
"_requested": {
- "type": "version",
+ "type": "range",
"registry": true,
- "raw": "[email protected]",
+ "raw": "safe-buffer@~5.1.1",
"name": "safe-buffer",
"escapedName": "safe-buffer",
- "rawSpec": "5.1.1",
+ "rawSpec": "~5.1.1",
"saveSpec": null,
- "fetchSpec": "5.1.1"
+ "fetchSpec": "~5.1.1"
},
"_requiredBy": [
- "/mysql",
+ "/mqtt-packet",
"/readable-stream",
- "/string_decoder"
+ "/string_decoder",
+ "/websocket-stream",
+ "/ws"
],
"_resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
"_shasum": "893312af69b2123def71f57889001671eeb2c853",
- "_spec": "[email protected]",
- "_where": "/Users/sebastian/Coding/Junction/StoreAndRecycle/Server_SAR/node_modules/mysql",
+ "_spec": "safe-buffer@~5.1.1",
+ "_where": "/home/leenr/Junction-2017/sio-mqtt/node_modules/readable-stream",
"author": {
"name": "Feross Aboukhadijeh",
"email": "[email protected]",
diff --git a/Server_SAR/node_modules/string_decoder/package.json b/Server_SAR/node_modules/string_decoder/package.json
index ed6fc4b..dc51f81 100644
--- a/Server_SAR/node_modules/string_decoder/package.json
+++ b/Server_SAR/node_modules/string_decoder/package.json
@@ -21,7 +21,7 @@
"_resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
"_shasum": "0fc67d7c141825de94282dd536bec6b9bce860ab",
"_spec": "string_decoder@~1.0.3",
- "_where": "/Users/sebastian/Coding/Junction/StoreAndRecycle/Server_SAR/node_modules/readable-stream",
+ "_where": "/home/leenr/Junction-2017/sio-mqtt/node_modules/readable-stream",
"bugs": {
"url": "https://github.com/rvagg/string_decoder/issues"
},
diff --git a/Server_SAR/node_modules/util-deprecate/package.json b/Server_SAR/node_modules/util-deprecate/package.json
index 8e92e66..cc38a1d 100644
--- a/Server_SAR/node_modules/util-deprecate/package.json
+++ b/Server_SAR/node_modules/util-deprecate/package.json
@@ -21,7 +21,7 @@
"_resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
"_shasum": "450d4dc9fa70de732762fbd2d4a28981419a0ccf",
"_spec": "util-deprecate@~1.0.1",
- "_where": "/Users/sebastian/Coding/Junction/StoreAndRecycle/Server_SAR/node_modules/readable-stream",
+ "_where": "/home/leenr/Junction-2017/sio-mqtt/node_modules/readable-stream",
"author": {
"name": "Nathan Rajlich",
"email": "[email protected]",
diff --git a/Server_SAR/rfid_tracker.js b/Server_SAR/rfid_tracker.js
index c344dbf..933b6cc 100644
--- a/Server_SAR/rfid_tracker.js
+++ b/Server_SAR/rfid_tracker.js
@@ -2,6 +2,8 @@ var mqtt = require('mqtt');
var client = mqtt.connect('mqtt://mqtt.intelligentpackaging.online');
var mysql = require('mysql');
var last_tag_read = "";
+var registering_tag = -1;
+var registered_tag_cb;
var con = mysql.createConnection({
host: "localhost",
@@ -14,19 +16,30 @@ client.on('connect', function () {
//client.subscribe('location/Junction.2017.2/+');
client.subscribe('location/Junction.2017.3/+');
//client.subscribe('location/Junction.2017.4/+');
-})
+});
client.on('message', function (topic, message) {
// message is Buffer
console.log(topic.toString() + " " + message.toString());
- storage_action(topic, message);
-})
+ //storage_action(topic, message);
+});
function storage_action(t , m) {
var tag = t.toString().split("/")[1];
if (tag == "Junction.2017.2" || tag == "Junction.2017.4") {
return;
}
+
+ if (registering_tag > -1) {
+ con.query("USE sys");
+ con.query("UPDATE products SET `tag` = " + tag + " WHERE `idproducts` = '" + p_id + "' ", function (err, result, fields) {
+ if (err) { throw err;}
+ });
+
+ registering_tag = -1;
+ registered_tag_cb();
+ return;
+ }
/*con.connect(function(err) {
if (err) {
throw err;
@@ -64,3 +77,8 @@ function update_db(t, went_in) {
}
});
}
+
+function wait_for_tag(p_id) {
+ console.log("Waiting for tag to be scanned.")
+ registering_tag = p_id;
+}