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

Fix saving Trigger Camera Groups

matrix-notifications
Moe 2022-07-31 23:04:28 -07:00
parent d001edb3fc
commit 2deb91bd9a
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
web/assets/js/bs5.monitorSettings.js
View File

@ -286,6 +286,14 @@ function getMonitorGroupsSelected(){
}) })
return monitorGroupsInSelection return monitorGroupsInSelection
} }
function getMonitorTriggerGroupsSelected(){
var monitorGroupsInSelection = []
monitorEditorWindow.find('[group_detector_multi]:checked').each(function(n,v){
var monitorId = $(v).val()
monitorGroupsInSelection.push(monitorId)
})
return monitorGroupsInSelection
}
var differentiateMonitorConfig = function(firstConfig,secondConfig){ var differentiateMonitorConfig = function(firstConfig,secondConfig){
console.log(firstConfig,secondConfig) console.log(firstConfig,secondConfig)
var diffedConfig = {} var diffedConfig = {}
@ -407,6 +415,7 @@ window.getMonitorEditFormFields = function(){
monitorConfig.details = safeJsonParse(monitorConfig.details) monitorConfig.details = safeJsonParse(monitorConfig.details)
monitorConfig.details.substream = getSubStreamChannelFields() monitorConfig.details.substream = getSubStreamChannelFields()
monitorConfig.details.groups = getMonitorGroupsSelected() monitorConfig.details.groups = getMonitorGroupsSelected()
monitorConfig.details.group_detector_multi = getMonitorTriggerGroupsSelected()
monitorConfig.details.input_map_choices = monitorSectionInputMapsave() monitorConfig.details.input_map_choices = monitorSectionInputMapsave()
// TODO : Input Maps and Stream Channels (does old way at the moment) // TODO : Input Maps and Stream Channels (does old way at the moment)
@ -648,7 +657,7 @@ function importIntoMonitorEditor(options){
${v.name} <span class="text-muted">(${v.id})</span> ${v.name} <span class="text-muted">(${v.id})</span>
</div> </div>
<div class="pr-3"> <div class="pr-3">
<span><input class="form-check-input no-abs mdl-switch__input form-check-input" type="checkbox" value="${v.id}" ${isSelected ? 'checked' : ''}/></span> <span><input class="form-check-input no-abs" ${b} type="checkbox" value="${v.id}" ${isSelected ? 'checked' : ''}/></span>
</div> </div>
</div> </div>
</div>` </div>`
@ -974,15 +983,6 @@ monitorEditorWindow.on('change','[groups]',function(){
}); });
monitorEditorWindow.find('[detail="groups"]').val(JSON.stringify(selectedGroups)).change() monitorEditorWindow.find('[detail="groups"]').val(JSON.stringify(selectedGroups)).change()
}) })
monitorEditorWindow.on('change','[group_detector_multi]',function(){
var e={};
var el = monitorEditorWindow.find('[group_detector_multi]:checked');
var selectedMultiTrigger=[];
el.each(function(n,v){
selectedMultiTrigger.push($(v).val())
});
monitorEditorWindow.find('[detail="group_detector_multi"]').val(JSON.stringify(selectedMultiTrigger)).change()
})
monitorEditorWindow.on('change','.detector_cascade_selection',function(){ monitorEditorWindow.on('change','.detector_cascade_selection',function(){
var e={}; var e={};
var el = monitorEditorWindow.find('.detector_cascade_selection:checked'); var el = monitorEditorWindow.find('.detector_cascade_selection:checked');
@ -1166,7 +1166,7 @@ editorForm.find('[name="type"]').change(function(e){
${hasSelectedMonitor ? `<ul class="json-to-block striped import-monitor-preset cursor-pointer">${jsonToHtmlBlock(humanizedMonitorKeys)}</ul>` : ''} ${hasSelectedMonitor ? `<ul class="json-to-block striped import-monitor-preset cursor-pointer">${jsonToHtmlBlock(humanizedMonitorKeys)}</ul>` : ''}
</div> </div>
<div class="pr-3"> <div class="pr-3">
<span><input class="form-check-input no-abs mdl-switch__input" type="checkbox" value="${preset.name}" ${hasSelectedMonitor ? 'checked' : ''}/></span> <span><input class="form-check-input no-abs" type="checkbox" value="${preset.name}" ${hasSelectedMonitor ? 'checked' : ''}/></span>
</div> </div>
<div> <div>
<a class="badge btn btn-sm btn-danger delete-preset"><i class="fa fa-trash-o"></i></a> <a class="badge btn btn-sm btn-danger delete-preset"><i class="fa fa-trash-o"></i></a>