-
Notifications
You must be signed in to change notification settings - Fork 114
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Move the input matching code out of the DiaryHelper
Two main reasons: - It really doesn't belong there; the rest of the functions there deal with formatting trips and maps, and are in a common service to avoid duplication between the diary and the common tabs. - It causes a circular dependency when we try to call the directive to process the inputs that we read e-mission/e-mission-docs#727 (comment) e-mission/e-mission-docs#727 (comment) e-mission/e-mission-docs#727 (comment)
- Loading branch information
Showing
6 changed files
with
132 additions
and
125 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,121 @@ | ||
| 'use strict'; | ||
|
|
||
| angular.module('emission.survey.inputmatcher', ['emission.plugin.logger']) | ||
| .factory('InputMatcher', function($translate){ | ||
| var im = {}; | ||
| var fmtTs = function(ts_in_secs, tz) { | ||
| return moment(ts_in_secs * 1000).tz(tz).format(); | ||
| } | ||
|
|
||
| var printUserInput = function(ui) { | ||
| return fmtTs(ui.data.start_ts, ui.metadata.time_zone) + "("+ui.data.start_ts + ") -> "+ | ||
| fmtTs(ui.data.end_ts, ui.metadata.time_zone) + "("+ui.data.end_ts + ")"+ | ||
| " " + ui.data.label + " logged at "+ ui.metadata.write_ts; | ||
| } | ||
|
|
||
| im.getUserInputForTrip = function(trip, nextTrip, userInputList) { | ||
| // If there is only one item in the list, return it. | ||
| // This make it compatible when fake list is given (for Enketo Survey). | ||
| // As well as optimize the performance. | ||
| if (userInputList.length === 1) { | ||
| return userInputList[0]; | ||
| } | ||
| if (userInputList.length < 20) { | ||
| console.log("Input list = "+userInputList.map(printUserInput)); | ||
| } | ||
| // undefined != true, so this covers the label view case as well | ||
| var isDraft = trip.isDraft == true; | ||
| var potentialCandidates = userInputList.filter(function(userInput) { | ||
| /* | ||
| console.log("startDelta "+userInput.data.label+ | ||
| "= user("+fmtTs(userInput.data.start_ts, userInput.metadata.time_zone)+ | ||
| ") - trip("+fmtTs(userInput.data.start_ts, userInput.metadata.time_zone)+") = "+ | ||
| (userInput.data.start_ts - trip.start_ts)+" should be positive"); | ||
| console.log("endDelta = "+userInput.data.label+ | ||
| "user("+fmtTs(userInput.data.end_ts, userInput.metadata.time_zone)+ | ||
| ") - trip("+fmtTs(trip.end_ts, userInput.metadata.time_zone)+") = "+ | ||
| (userInput.data.end_ts - trip.end_ts)+" should be negative"); | ||
| */ | ||
| // logic described in | ||
| // https://github.com/e-mission/e-mission-docs/issues/423 | ||
| if (isDraft) { | ||
| if (userInputList.length < 20) { | ||
| var logStr = "Draft trip: comparing user = "+fmtTs(userInput.data.start_ts, userInput.metadata.time_zone) | ||
| +" -> "+fmtTs(userInput.data.end_ts, userInput.metadata.time_zone) | ||
| +" trip = "+fmtTs(trip.start_ts, userInput.metadata.time_zone) | ||
| +" -> "+fmtTs(trip.end_ts, userInput.metadata.time_zone) | ||
| +" checks are ("+(userInput.data.start_ts >= trip.start_ts) | ||
| +" && "+(userInput.data.start_ts <= trip.end_ts) | ||
| +" || "+(-(userInput.data.start_ts - trip.start_ts) <= 15 * 60) | ||
| +") && "+(userInput.data.end_ts <= trip.end_ts); | ||
| console.log(logStr); | ||
| // Logger.log(logStr); | ||
| } | ||
| return (userInput.data.start_ts >= trip.start_ts | ||
| && userInput.data.start_ts <= trip.end_ts | ||
| || -(userInput.data.start_ts - trip.start_ts) <= 15 * 60) | ||
| && userInput.data.end_ts <= trip.end_ts; | ||
| } else { | ||
| // we know that the trip is cleaned so we can use the fmt_time | ||
| // but the confirm objects are not necessarily filled out | ||
| if (userInputList.length < 20) { | ||
| var logStr = "Cleaned trip: comparing user = " | ||
| +fmtTs(userInput.data.start_ts, userInput.metadata.time_zone) | ||
| +" -> "+fmtTs(userInput.data.end_ts, userInput.metadata.time_zone) | ||
| +" trip = "+trip.start_fmt_time | ||
| +" -> "+trip.end_fmt_time | ||
| +" start checks are "+(userInput.data.start_ts >= trip.start_ts) | ||
| +" && "+(userInput.data.start_ts <= trip.end_ts) | ||
| +" end checks are "+(userInput.data.end_ts <= trip.end_ts) | ||
| +" || "+((userInput.data.end_ts - trip.end_ts) <= 15 * 60)+")"; | ||
| Logger.log(logStr); | ||
| } | ||
| // https://github.com/e-mission/e-mission-docs/issues/476#issuecomment-747222181 | ||
| const startChecks = userInput.data.start_ts >= trip.start_ts && | ||
| userInput.data.start_ts <= trip.end_ts; | ||
| var endChecks = (userInput.data.end_ts <= trip.end_ts || | ||
| (userInput.data.end_ts - trip.end_ts) <= 15 * 60); | ||
| if (startChecks && !endChecks) { | ||
| if (angular.isDefined(nextTrip)) { | ||
| endChecks = userInput.data.end_ts <= nextTrip.start_ts; | ||
| Logger.log("Second level of end checks when the next trip is defined("+userInput.data.end_ts+" <= "+ nextTrip.start_ts+") = "+endChecks); | ||
| } else { | ||
| // next trip is not defined, last trip | ||
| endChecks = (userInput.data.end_local_dt.day == userInput.data.start_local_dt.day) | ||
| Logger.log("Second level of end checks for the last trip of the day"); | ||
| Logger.log("compare "+userInput.data.end_local_dt.day + " with " + userInput.data.start_local_dt.day + " = " + endChecks); | ||
| } | ||
| if (endChecks) { | ||
| // If we have flipped the values, check to see that there | ||
| // is sufficient overlap | ||
| const overlapDuration = Math.min(userInput.data.end_ts, trip.end_ts) - Math.max(userInput.data.start_ts, trip.start_ts) | ||
| Logger.log("Flipped endCheck, overlap("+overlapDuration+ | ||
| ")/trip("+trip.duration+") = "+ (overlapDuration / trip.duration)); | ||
| endChecks = (overlapDuration/trip.duration) > 0.5; | ||
| } | ||
| } | ||
| return startChecks && endChecks; | ||
| } | ||
| }); | ||
| if (potentialCandidates.length === 0) { | ||
| if (userInputList.length < 20) { | ||
| Logger.log("In getUserInputForTripStartEnd, no potential candidates, returning []"); | ||
| } | ||
| return undefined; | ||
| } | ||
|
|
||
| if (potentialCandidates.length === 1) { | ||
| Logger.log("In getUserInputForTripStartEnd, one potential candidate, returning "+ printUserInput(potentialCandidates[0])); | ||
| return potentialCandidates[0]; | ||
| } | ||
|
|
||
| Logger.log("potentialCandidates are "+potentialCandidates.map(printUserInput)); | ||
| var sortedPC = potentialCandidates.sort(function(pc1, pc2) { | ||
| return pc2.metadata.write_ts - pc1.metadata.write_ts; | ||
| }); | ||
| var mostRecentEntry = sortedPC[0]; | ||
| Logger.log("Returning mostRecentEntry "+printUserInput(mostRecentEntry)); | ||
| return mostRecentEntry; | ||
| } | ||
| return im; | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters