Skip to content

Commit d5a2c2b

Browse files
committed
properly check for existing meetings.
note: depends on server changes
1 parent df64c0a commit d5a2c2b

File tree

1 file changed

+15
-6
lines changed

1 file changed

+15
-6
lines changed

www/js/index.js

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ function Meeting(group, members, type, moderator, description, location) {
139139
this.moderator = moderator;
140140
this.description = description;
141141
this.uuid = device.uuid + "_" + this.startTime.getTime();
142+
this.key;
142143
this.log_index = 0
143144

144145
this.toPost = []
@@ -779,7 +780,7 @@ meetingPage = new Page("meeting",
779780
app.meeting.writeLog("meeting ended",
780781
{'end_method':"manual", "end_time":new Date()/1000}
781782
).then(function () {
782-
app.syncLogFile(app.meeting.getLogName(), true, "maunal", new Date())
783+
app.syncLogFile(app.meeting.getLogName(), true, "manual", new Date())
783784
})
784785
if (app.meeting.pause_countdown) {
785786
app.meeting.pause_countdown.end()
@@ -1248,13 +1249,21 @@ app = {
12481249
syncLogFile: function(filename, isComplete, endingMethod, endTime, meetings) {
12491250
console.log("Starting to sync")
12501251
var meeting_uuid = filename.split(".")[0]
1252+
var mtg_key = "";
1253+
$.each(meetings, function(key, val) {
1254+
if (val.uuid === meeting_uuid) {
1255+
mtg_key = key;
1256+
//break the loop we found it
1257+
return false;
1258+
}
1259+
});
12511260

1252-
if (meetings && (meeting_uuid in meetings) && meetings[meeting_uuid].is_complete) return
1261+
if (mtg_key && meetings[mtg_key].is_complete) return
12531262

1254-
if ( app.force_put || isComplete || (meetings && !(meeting_uuid in meetings))) {
1263+
if (app.force_put || isComplete || !mtg_key) {
12551264
app.force_put = false
12561265

1257-
console.log("PUTiing")
1266+
console.log("PUTting")
12581267
var fileTransfer = new FileTransfer();
12591268
var uri = encodeURI(BASE_URL + app.project.key + "/meetings");
12601269

@@ -1317,8 +1326,8 @@ app = {
13171326

13181327
} else {
13191328
console.log("Trying to POST")
1320-
var last_log_timestamp = meetings[meeting_uuid].last_log_timestamp
1321-
var last_log_serial = meetings[meeting_uuid].last_log_serial
1329+
var last_log_timestamp = meetings[mtg_key].last_log_timestamp
1330+
var last_log_serial = meetings[mtg_key].last_log_serial
13221331

13231332
var toPost = []
13241333
window.fileStorage.load(meeting_uuid + ".txt").then( function(log) {

0 commit comments

Comments
 (0)