Skip to content

Commit

Permalink
Fixed minor bug and functionality changes
Browse files Browse the repository at this point in the history 
1. Change for graph processing
2. Fix for minor bugs
  • Loading branch information
@tchrapovic
tchrapovic committed Dec 9, 2022
1 parent 2feb676 commit 9bc01bd
Show file tree
Hide file tree
Showing 7 changed files with 557 additions and 606 deletions.
84 changes: 48 additions & 36 deletions ...dmin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/PageRoleMining.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@

<div class="col-xl-12 row">
<div class="d-flex flex-wrap col-xl-7 ">
<div class="btn-group btn-group-sm col-xl-5 align-self-start">
<a class="btn btn-default" wicket:id="role_search">
<div class="btn-group col-xl-5 align-self-start">
<button class="btn btn-default" wicket:id="role_search">
<wicket:message key="Role.searchType.role"/>
</a>
<a class="btn btn-default" wicket:id="user_search">
</button>
<button class="btn btn-default" wicket:id="user_search">
<wicket:message key="Role.searchType.users"/>
</a>
</button>

</div>

Expand All @@ -33,48 +33,45 @@

<form wicket:id="min_size_form">
<div class="row">
<label>
<input style="width: 50px" wicket:id="input_min_size" type="text" placeholder="Enter min. role counts" size="20"/>
</label>
<input class="btn btn-default" type="submit" value="Submit"/>
<div>
<input class="form-control" style="width: 50px" wicket:id="input_min_size" type="text" placeholder="Enter min. role counts" size="20"/>
</div>
<div>
<i wicket:id="min_size_input_info" wicket:message="title:Role.basic.intersection.search.tooltip"/>
</div>
<input class="btn btn-default" type="submit" value="Execute search"/>
<div>
<i wicket:id="min_size_execute_info" wicket:message="title:Role.basic.execute.search.tooltip"/>
</div>
</div>
</form>

<a class="btn btn-default" wicket:id="table_ref">
<button class="btn btn-default ml-4" wicket:id="button_next_result">
<wicket:message key="PageRoleMining.users.table.result"/>
</a>
</button>

<a class="btn btn-default">
<label wicket:id="resultCountLabel">
</label>
</a>

<a class="btn btn-default">
<label wicket:id="repeatingCount">
</label>
</a>
</div>
</div>


<wicket:child/>

<div class="d-flex flex-wrap col-xl-5 flex-row-reverse">

<div class="btn-group btn-group-sm ">

<a class="btn btn-default" wicket:id="checkDuplicates">
<button class="btn btn-default" wicket:id="checkDuplicates">
<wicket:message key="Role.check.intersection.count"/>
</a>

<a class="btn btn-default ">
<label wicket:id="repeatingCountBasicTable">
</label>
<i wicket:id="basic_check_info" wicket:message="title:Role.check.intersection.count.tooltip"/>
</button>
<a class="btn btn-default" wicket:id="repeatingCountBasicTable">
</a>
</div>
</div>

</div>
<wicket:child/>

<div class="row" style="display:-webkit-box; display:-webkit-flex; display:-ms-flexbox; display:flex;">

<div class="col-12 col-xl-7 overflow-auto" style="height:900px">
Expand All @@ -95,26 +92,41 @@

<form wicket:id="jaccard_threshold_form">
<div class="row">
<label>
<input style="width: 50px" wicket:id="jaccard_threshold_input" type="text" placeholder="Jaccard threshold" size="3"/>
</label>
<label>
<input style="width: 50px" wicket:id="jaccard_min_roles_count_input" type="text" placeholder="Jaccard threshold" size="2"/>
</label>
<input class="btn btn-default" type="submit" value="Submit"/>
<div>
<input class="form-control" style="width: 50px" wicket:id="jaccard_threshold_input" type="text" placeholder="Jaccard threshold" size="3"/>
</div>
<div>
<i wicket:id="jaccard_threshold_input_info" wicket:message="title:Role.jaccard.single.threshold.tooltip"/>
</div>
<div>
<input class="form-control" style="width: 50px" wicket:id="jaccard_min_roles_count_input" type="text" placeholder="Jaccard threshold" size="2"/>
</div>
<div>
<i wicket:id="jaccard_min_roles_count_info" wicket:message="title:Role.jaccard.intersection.count.tooltip"/>
</div>
<input class="btn btn-default" type="submit" value="Submit settings"/>
<div>
<i wicket:id="jaccard_execute_details" wicket:message="title:Role.jaccard.execute.setting.tooltip"/>
</div>
</div>
</form>

<div class="row" style="display:-webkit-box; display:-webkit-flex; display:-ms-flexbox; display:flex;">

<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/3.7.1/chart.min.js"></script>
<div class="col-12 col-xl-12 overflow-auto" style="height:500px">
<canvas id="barChart" style="height:500px;background-color: white"></canvas>
<canvas id="barChart" style="height:500px;background-color: white"></canvas>
</div>

<div class="col-12 col-xl-12 overflow-auto">
<button wicket:id="calculator" type="button" class="btn btn-outline-primary"></button>
<button wicket:id="jaccard_execute_search" type="button" class="btn btn-outline-primary"></button>
<div class="row">
<button wicket:id="calculator" type="button" class="btn btn-outline-primary"></button>
<button wicket:id="jaccard_execute_search" type="button" class="btn btn-outline-primary">
</button>
<div>
<i wicket:id="jaccard_execute_search_info" wicket:message="title:Role.jaccard.execute.search.tooltip"/>
</div>
</div>
<div wicket:id="table_jaccard_users"></div>
</div>

Expand Down

0 comments on commit 9bc01bd

Please sign in to comment.