global validation for export now includes start and end time validati…

…on - MR
thoughtworksarts · Mar 21, 2018 · 004ed24 · 004ed24
1 parent 629dd23
commit 004ed24
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/app/components/timeRange.js b/app/components/timeRange.js
@@ -47,13 +47,14 @@ export default class TimeRange extends React.Component {
                 <label> &nbsp; End Time: &nbsp;</label>
                 <input name="end" id="timeRange" type="text" placeholder="00:00.00" value={this.props.range[1]}
                        onChange={this.handleInputChange}/>
-                       
+
                 <span id="formatvalidFormatator" style={this.validateInput()}>  
                 	&nbsp; valid format is MM:SS.FF (with seconds between 0 and 59 and frames between 0 and {this.props.numFrames})
                 </span>
                 <span id="endAndStartValidator" style={this.validateEndAndStart()}>
-                    &nbsp; end time stamp must be after or equal to the start time
+                    &nbsp; end timestamp must be after (or equal to) start timestamp
                 </span>
+
 			</div>
 		);
 	}

diff --git a/app/utilities/validators.js b/app/utilities/validators.js
@@ -26,7 +26,7 @@ export const endIsLaterThanStart = (range) => {
 	return (startMins === endMins 
 			? (startSeconds === endSeconds 
 				? (startFrames === endFrames
-					? true // if they're the same, then return true
+					? true
 					: endFrames > startFrames)
 				: endSeconds > startSeconds)
 			: endMins > startMins);
@@ -43,8 +43,15 @@ export const validateAllInputs = (state, numFrames) => {
 	let traverser = (obj) => {
 	  if (typeof obj == "object") {
         Object.entries(obj).forEach(([key, value]) => {
-            if ((key === "start" || key === "end") && !isValid(value, numFrames)) {
-                valid = false;
+            if (key === "start") {
+            	const startTime = obj.start;
+            	const endTime = obj.end;
+
+            	if (!isValid(startTime, numFrames) 
+            	 || !isValid(endTime, numFrames) 
+            	 || !endIsLaterThanStart([startTime, endTime])) {
+                	valid = false;
+            	}
             }
             traverser(value);
         });