ShinobiSystems
/
Shinobi
mirror of https://gitlab.com/Shinobi-Systems/Shinobi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup Day Card video selection

merge-requests/367/head
Moe 2022-07-07 11:03:29 -07:00
parent 521cb9bc77
commit 7741796f77
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
web/assets/css/bs5.videoPlayer.css
View File

@ -68,10 +68,13 @@
top: 0; top: 0;
} }
.video-time-needle-event { .video-time-needle-event {
border-left: 3px solid rgb(249 242 31); border-left: 3px solid #fffb00;
border-radius: 0; border-radius: 0;
z-index: 999; z-index: 999;
} }
.video-time-needle-seeker {
border-left: 3px solid #f00;
}
.video-day-slice { .video-day-slice {
height: 100%; height: 100%;
background: #1f80f9; background: #1f80f9;

15
web/assets/js/bs5.videos.js
View File

@ -124,13 +124,14 @@ function getFrameOnVideoRow(percentageInward,video){
timeAdded: timeAdded, timeAdded: timeAdded,
} }
} }
function getVideoFromDay(percentageInward,videos,startTime,endTime){ function getVideoFromDay(percentageInward,reversedVideos,startTime,endTime){
var timeDifference = endTime - startTime var timeDifference = endTime - startTime
var timeInward = timeDifference / (100 / percentageInward) var timeInward = timeDifference / (100 / percentageInward)
var timeAdded = new Date(startTime.getTime() + timeInward) // ms var timeAdded = new Date(startTime.getTime() + timeInward) // ms
var foundVideo = ([]).concat(videos).reverse().find(function(row){ var foundVideoIndex = reversedVideos.findIndex(function(row){
return new Date(timeAdded - 1000) >= new Date(row.time) return new Date(timeAdded) >= new Date(row.time)
}); });
var foundVideo = reversedVideos[foundVideoIndex - 1] || reversedVideos[foundVideoIndex] || reversedVideos[0]
return foundVideo return foundVideo
} }
// function bindFrameFindingByMouseMove(createdCardCarrier,video){ // function bindFrameFindingByMouseMove(createdCardCarrier,video){
@ -209,15 +210,16 @@ function bindFrameFindingByMouseMoveForDay(createdCardCarrier,dayKey,videos,allF
} }
var videoSlices = createdCardElement.find('.video-day-slice') var videoSlices = createdCardElement.find('.video-day-slice')
var videoTimeLabel = createdCardElement.find('.video-time-label') var videoTimeLabel = createdCardElement.find('.video-time-label')
var currentlySelected = null var currentlySelected = videos[0]
var currentlySelectedFrame = null var currentlySelectedFrame = null
var reversedVideos = ([]).concat(videos).reverse();
createdCardElement.on('mousemove',function(evt){ createdCardElement.on('mousemove',function(evt){
var offest = createdCardElement.offset() var offest = createdCardElement.offset()
var elementWidth = createdCardElement.width() + 2 var elementWidth = createdCardElement.width() + 2
var amountMoved = evt.pageX - offest.left var amountMoved = evt.pageX - offest.left
var percentMoved = amountMoved / elementWidth * 100 var percentMoved = amountMoved / elementWidth * 100
percentMoved = percentMoved > 100 ? 100 : percentMoved < 0 ? 0 : percentMoved percentMoved = percentMoved > 100 ? 100 : percentMoved < 0 ? 0 : percentMoved
var videoFound = videos[0] ? getVideoFromDay(percentMoved,videos,dayStart,dayEnd) : null var videoFound = videos[0] ? getVideoFromDay(percentMoved,reversedVideos,dayStart,dayEnd) : null
createdCardElement.find(`[data-time]`).css('background-color','') createdCardElement.find(`[data-time]`).css('background-color','')
if(videoFound){ if(videoFound){
// var videoSlice = createdCardElement.find(`[data-time="${videoFound.time}"]`).css('background-color','rgba(255,255,255,0.3)') // var videoSlice = createdCardElement.find(`[data-time="${videoFound.time}"]`).css('background-color','rgba(255,255,255,0.3)')
@ -375,6 +377,7 @@ function createDayCard(videos,frames,dayKey,monitorId,classOverride){
var stripTimes = getStripStartAndEnd(videos,frames) var stripTimes = getStripStartAndEnd(videos,frames)
var startTime = stripTimes.start var startTime = stripTimes.start
var endTime = stripTimes.end var endTime = stripTimes.end
var firstVideoTime = videos[0] ? videos[0].time : null
var dayParts = formattedTime(startTime).split(' ')[1].split('-') var dayParts = formattedTime(startTime).split(' ')[1].split('-')
var day = dayParts[2] var day = dayParts[2]
var month = dayParts[1] var month = dayParts[1]
@ -414,7 +417,7 @@ function createDayCard(videos,frames,dayKey,monitorId,classOverride){
</div> </div>
<div class="video-time-strip card-footer p-0"> <div class="video-time-strip card-footer p-0">
<div class="flex-row d-flex" style="height:30px">${eventMatrixHtml}</div> <div class="flex-row d-flex" style="height:30px">${eventMatrixHtml}</div>
<div class="video-time-needle video-time-needle-seeker" data-mid="${monitorId}" style="z-index: 2"></div> <div class="video-time-needle video-time-needle-seeker" ${firstVideoTime ? `video-time-seeked-video-position="${firstVideoTime}"` : ''} data-mid="${monitorId}" style="z-index: 2"></div>
</div> </div>
</div> </div>
</div>` </div>`