Added plus/minus actions to filter.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1562 e3e1d417-86f3-4887-817a-d78f3d33393fpull/27/merge
stan
parent
f41b1398cf
commit
3e635e1213
|
|
@ -130,6 +130,73 @@ if ( isset($action) )
|
|||
$refresh_parent = true;
|
||||
}
|
||||
}
|
||||
elseif ( $action == "addterm" )
|
||||
{
|
||||
for ( $i = $trms; $i > $subaction; $i-- )
|
||||
{
|
||||
$conjunction_name1 = "cnj".($i+1);
|
||||
$obracket_name1 = "obr".($i+1);
|
||||
$cbracket_name1 = "cbr".($i+1);
|
||||
$attr_name1 = "attr".($i+1);
|
||||
$op_name1 = "op".($i+1);
|
||||
$value_name1 = "val".($i+1);
|
||||
|
||||
$conjunction_name2 = "cnj$i";
|
||||
$obracket_name2 = "obr$i";
|
||||
$cbracket_name2 = "cbr$i";
|
||||
$attr_name2 = "attr$i";
|
||||
$op_name2 = "op$i";
|
||||
$value_name2 = "val$i";
|
||||
|
||||
$$conjunction_name1 = $$conjunction_name2;
|
||||
$$obracket_name1 = $$obracket_name2;
|
||||
$$cbracket_name1 = $$cbracket_name2;
|
||||
$$attr_name1 = $$attr_name2;
|
||||
$$op_name1 = $$op_name2;
|
||||
$$value_name1 = $$value_name2;
|
||||
}
|
||||
$$conjunction_name2 = false;
|
||||
$$obracket_name2 = false;
|
||||
$$cbracket_name2 = false;
|
||||
$$attr_name2 = false;
|
||||
$$op_name2 = false;
|
||||
$$value_name2 = false;
|
||||
|
||||
$trms++;
|
||||
}
|
||||
elseif ( $action == "delterm" )
|
||||
{
|
||||
$trms--;
|
||||
for ( $i = $subaction; $i <= $trms; $i++ )
|
||||
{
|
||||
$conjunction_name1 = "cnj$i";
|
||||
$obracket_name1 = "obr$i";
|
||||
$cbracket_name1 = "cbr$i";
|
||||
$attr_name1 = "attr$i";
|
||||
$op_name1 = "op$i";
|
||||
$value_name1 = "val$i";
|
||||
|
||||
$conjunction_name2 = "cnj".($i+1);
|
||||
$obracket_name2 = "obr".($i+1);
|
||||
$cbracket_name2 = "cbr".($i+1);
|
||||
$attr_name2 = "attr".($i+1);
|
||||
$op_name2 = "op".($i+1);
|
||||
$value_name2 = "val".($i+1);
|
||||
|
||||
$$conjunction_name1 = $$conjunction_name2;
|
||||
$$obracket_name1 = $$obracket_name2;
|
||||
$$cbracket_name1 = $$cbracket_name2;
|
||||
$$attr_name1 = $$attr_name2;
|
||||
$$op_name1 = $$op_name2;
|
||||
$$value_name1 = $$value_name2;
|
||||
}
|
||||
$$conjunction_name2 = false;
|
||||
$$obracket_name2 = false;
|
||||
$$cbracket_name2 = false;
|
||||
$$attr_name2 = false;
|
||||
$$op_name2 = false;
|
||||
$$value_name2 = false;
|
||||
}
|
||||
elseif ( $action == "delete" )
|
||||
{
|
||||
if ( !$mark_eids && $mark_eid )
|
||||
|
|
|
|||
|
|
@ -212,6 +212,22 @@ function deleteFilter( form, name )
|
|||
submitToFilter( form, 1 );
|
||||
}
|
||||
}
|
||||
function addTerm( form, line )
|
||||
{
|
||||
form.target = window.name;
|
||||
form.view.value = '<?= $view ?>';
|
||||
form.action.value = 'addterm';
|
||||
form.subaction.value = line;
|
||||
form.submit();
|
||||
}
|
||||
function delTerm( form, line )
|
||||
{
|
||||
form.target = window.name;
|
||||
form.view.value = '<?= $view ?>';
|
||||
form.action.value = 'delterm';
|
||||
form.subaction.value = line;
|
||||
form.submit();
|
||||
}
|
||||
window.focus();
|
||||
</script>
|
||||
</head>
|
||||
|
|
@ -221,30 +237,31 @@ window.focus();
|
|||
<input type="hidden" name="page" value="<?= $page ?>">
|
||||
<input type="hidden" name="reload" value="0">
|
||||
<input type="hidden" name="action" value="">
|
||||
<input type="hidden" name="subaction" value="">
|
||||
<input type="hidden" name="fid" value="">
|
||||
<input type="hidden" name="trms" value="<?= $trms ?>">
|
||||
<center><table width="96%" align="center" border="0" cellspacing="1" cellpadding="0">
|
||||
<tr>
|
||||
<td valign="top"><table border="0" cellspacing="0" cellpadding="0" width="100%">
|
||||
<tr>
|
||||
<td align="left" class="text"><?= $zmSlangUseFilterExprsPre ?><select name="trms" class="form" onChange="submitToFilter( document.filter_form, 0 );"><?php for ( $i = 0; $i <= 8; $i++ ) { ?><option value="<?= $i ?>"<?php if ( $i == $trms ) { echo " selected"; } ?>><?= $i ?></option><?php } ?></select><?= $zmSlangUseFilterExprsPost ?></td>
|
||||
<td align="center" class="text"><?= $zmSlangUseFilter ?>: <?php if ( count($filter_names) > 1 ) { echo buildSelect( $select_name, $filter_names, "submitToFilter( document.filter_form, 1 );" ); } else { ?><select class="form" disabled><option><?= $zmSlangNoSavedFilters ?></option></select><?php } ?></td>
|
||||
<td align="left" class="text"><?= $zmSlangUseFilter ?>: <?php if ( count($filter_names) > 1 ) { echo buildSelect( $select_name, $filter_names, "submitToFilter( document.filter_form, 1 );" ); } else { ?><select class="form" disabled><option><?= $zmSlangNoSavedFilters ?></option></select><?php } ?></td>
|
||||
<?php if ( canEdit( 'Events' ) ) { ?>
|
||||
<td align="center" class="text"><a href="javascript: saveFilter( document.filter_form );"><?= $zmSlangSave ?></a></td>
|
||||
<td align="right" class="text"><a href="javascript: saveFilter( document.filter_form );"><?= $zmSlangSave ?></a></td>
|
||||
<?php } else { ?>
|
||||
<td align="center" class="text"> </a></td>
|
||||
<td align="right" class="text"> </a></td>
|
||||
<?php } ?>
|
||||
<?php if ( canEdit( 'Events' ) && isset($filter_data) ) { ?>
|
||||
<td align="center" class="text"><a href="javascript: deleteFilter( document.filter_form, '<?= $filter_data['Name'] ?>' );"><?= $zmSlangDelete ?></a></td>
|
||||
<td align="right" class="text"><a href="javascript: deleteFilter( document.filter_form, '<?= $filter_data['Name'] ?>' );"><?= $zmSlangDelete ?></a></td>
|
||||
<?php } else { ?>
|
||||
<td align="center" class="text"> </a></td>
|
||||
<td align="right" class="text"> </a></td>
|
||||
<?php } ?>
|
||||
<td align="right" class="text"><a href="javascript: closeWindow();"><?= $zmSlangClose ?></a></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="5" class="text"><hr width="100%"></td>
|
||||
<td colspan="4" class="text"><hr width="100%"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="5">
|
||||
<td colspan="4">
|
||||
<table width="100%" border="0" cellspacing="0" cellpadding="0">
|
||||
<?php
|
||||
for ( $i = 1; $i <= $trms; $i++ )
|
||||
|
|
@ -284,6 +301,7 @@ else
|
|||
<td class="text"><input name="<?= $value_name ?>" value="<?= isset($$value_name)?$$value_name:'' ?>" class="form" size="24"></td>
|
||||
<?php } ?>
|
||||
<td class="text"><?php if ( $trms > 2 ) { echo buildSelect( $cbracket_name, $cbracket_types ); } else { ?> <?php } ?></td>
|
||||
<td class="text"><a href="javascript: addTerm(document.filter_form,<?= $i ?>)">+</a><?php if ( $trms > 1 ) { ?><a href="javascript: delTerm(document.filter_form,<?= $i ?>)">–</a><?php } ?></td>
|
||||
</tr>
|
||||
<?php
|
||||
}
|
||||
|
|
@ -292,15 +310,17 @@ else
|
|||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="5" class="text"><hr width="100%"></td>
|
||||
<td colspan="4" class="text"><hr width="100%"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="5" class="text"><table width="100%" cellpadding="0" cellspacing="0"><tr><td class="text" align="left"><?= $zmSlangSortBy ?> <?= buildSelect( "sort_field", $sort_fields ); ?> <?= buildSelect( "sort_asc", $sort_dirns ); ?></td><td class="text" align="right"><?= $zmSlangLimitResultsPre ?> <input type="input" size="6" name="limit" value="<?= $limit ?>" class="form"> <?= $zmSlangLimitResultsPost ?></td></tr></table></td>
|
||||
<td colspan="4" class="text"><table width="100%" cellpadding="0" cellspacing="0"><tr><td class="text" align="left"><?= $zmSlangSortBy ?> <?= buildSelect( "sort_field", $sort_fields ); ?> <?= buildSelect( "sort_asc", $sort_dirns ); ?></td><td class="text" align="right"><?= $zmSlangLimitResultsPre ?> <input type="input" size="6" name="limit" value="<?= $limit ?>" class="form"> <?= $zmSlangLimitResultsPost ?></td></tr></table></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="5" class="text"><hr width="100%"></td>
|
||||
<td colspan="4" class="text"><hr width="100%"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="4" align="right"><input type="button" value="<?= $zmSlangReset ?>" class="form" onClick="submitToFilter( document.filter_form, 1 );"> <input type="button" value="<?= $zmSlangSubmit ?>" class="form" onClick="if ( validateForm( document.filter_form ) ) submitToEvents( document.filter_form, 1 );"></td>
|
||||
</tr>
|
||||
<tr><td colspan="5" align="right"><input type="button" value="<?= $zmSlangReset ?>" class="form" onClick="submitToFilter( document.filter_form, 1 );"> <input type="button" value="<?= $zmSlangSubmit ?>" class="form" onClick="if ( validateForm( document.filter_form ) ) submitToEvents( document.filter_form, 1 );"></td></tr>
|
||||
</table></center>
|
||||
</form>
|
||||
</body>
|
||||
|
|
|
|||
Loading…
Reference in New Issue