artin/community-app
1
0
Fork 0
mirror of https://github.com/openMF/community-app.git synced 2026-02-06 14:26:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #261 from safiyu/audit

Browse Source 
audit trails search added
This commit is contained in:
Nayan Ambali 2013-11-09 03:43:39 -08:00
commit d399f9ecf0
9 changed files with 89 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/index.html
View File

@ -94,6 +94,26 @@
</div>
<!-- Navbar -->
<div ng-class="{fullscreen:true ,blockui:blockUI==true}" id="main" data-ng-hide="currentSession.user == null">
<div class="loading-widget-div" data-ng-show="blockUI">
<div id="circularG">
<div id="circularG_1" class="circularG">
</div>
<div id="circularG_2" class="circularG">
</div>
<div id="circularG_3" class="circularG">
</div>
<div id="circularG_4" class="circularG">
</div>
<div id="circularG_5" class="circularG">
</div>
<div id="circularG_6" class="circularG">
</div>
<div id="circularG_7" class="circularG">
</div>
<div id="circularG_8" class="circularG">
</div>
</div>
</div>
<nav>
<ul class="margin-nav nav nav-list ext-sidenav">
<li><a class="bolder black" href="#/nav/offices"><i class="icon-compass icon-large"></i>&nbsp;&nbsp;{{ 'label.navigation' | translate}}</a></li>

9
app/scripts/controllers/system/AuditController.js
View File

@ -7,6 +7,10 @@
resourceFactory.auditResource.get({templateResource: 'searchtemplate'} , function(data) {
scope.template = data;
});
scope.viewUser = function(item){
scope.userTypeahead = true;
scope.formData.user = item.id;
};
scope.search = function(){
scope.isCollapsed = true;
scope.displayResults = true;
@ -34,6 +38,11 @@
if (scope.date.fourth) { params.checkerDateTimeTo = reqFourthDate; };
resourceFactory.auditResource.search(params , function(data) {
scope.searchData = data;
if(scope.userTypeahead){
scope.formData.user = '';
scope.userTypeahead = false;
scope.user = '';
}
});
};

38
app/scripts/modules/notificationWidget.js
View File

@ -100,30 +100,15 @@ angular.module('notificationWidget', [])
// private notification messages
var _START_REQUEST_ = '_START_REQUEST_';
var _END_REQUEST_ = '_END_REQUEST_';
var loader = document.getElementById('main');
var template = document.createElement('div');
template.innerHTML ='<div class="loading-widget-div">'+
'<div id="circularG">'+
'<div id="circularG_1" class="circularG"> </div>'+
'<div id="circularG_2" class="circularG"></div>'+
'<div id="circularG_3" class="circularG"></div>'+
'<div id="circularG_4" class="circularG"></div>'+
'<div id="circularG_5" class="circularG"></div>'+
'<div id="circularG_6" class="circularG"></div>'+
'<div id="circularG_7" class="circularG"></div>'+
'<div id="circularG_8" class="circularG"></div>'+
'</div></div>'
// publish start request notification
var requestStarted = function() {
$rootScope.$broadcast(_START_REQUEST_);
$rootScope.blockUI = true;
loader.appendChild(template);
};
// publish end request notification
var requestEnded = function() {
$rootScope.$broadcast(_END_REQUEST_);
$rootScope.blockUI = false;
loader.removeChild(template);
};
// subscribe to start request notification
var onRequestStarted = function($scope, handler){
@ -145,28 +130,5 @@ angular.module('notificationWidget', [])
onRequestEnded: onRequestEnded
};
}])
// declare the directive that will show and hide the loading widget
.directive('loadingWidget', ['requestNotificationChannel', function (requestNotificationChannel) {
return {
restrict: "A",
link: function (scope, element) {
// hide the element initially
element.hide();
var startRequestHandler = function() {
// got the request start notification, show the element
element.show();
};
var endRequestHandler = function() {
// got the request start notification, show the element
element.hide();
};
// register for the request start notification
requestNotificationChannel.onRequestStarted(scope, startRequestHandler);
// register for the request end notification
requestNotificationChannel.onRequestEnded(scope, endRequestHandler);
}
};
}]);

6
app/styles/app.css
View File

@ -449,8 +449,8 @@ tr.pointer-main:hover {
.loading-widget-div {
position: fixed;
top: 40%;
left: 45%;
top: 50%;
left: 48%;
z-index: 100;
}
@ -774,7 +774,7 @@ nav
top: 0;
bottom: 0;
background-color: #ffffff;
border-right: 6px transparent black;
border-right: 2px solid #ffffff;
box-shadow: 4px 0 5px rgba(0,0,0,0.2);
z-index: 1;
cursor: pointer;

105
app/styles/style.css
View File

@ -1,8 +1,7 @@
#circularG{
position:relative;
width:50px;
height:50px;
}
width:45px;
height:45px}
.circularG{
position:absolute;
@ -11,27 +10,27 @@
height:10px;
-moz-border-radius:7px;
-moz-animation-name:bounce_circularG;
-moz-animation-duration:0.64s;
-moz-animation-duration:0.56s;
-moz-animation-iteration-count:infinite;
-moz-animation-direction:linear;
-webkit-border-radius:7px;
-webkit-animation-name:bounce_circularG;
-webkit-animation-duration:0.64s;
-webkit-animation-duration:0.56s;
-webkit-animation-iteration-count:infinite;
-webkit-animation-direction:linear;
-ms-border-radius:7px;
-ms-animation-name:bounce_circularG;
-ms-animation-duration:0.64s;
-ms-animation-duration:0.56s;
-ms-animation-iteration-count:infinite;
-ms-animation-direction:linear;
-o-border-radius:7px;
-o-animation-name:bounce_circularG;
-o-animation-duration:0.64s;
-o-animation-duration:0.56s;
-o-animation-iteration-count:infinite;
-o-animation-direction:linear;
border-radius:7px;
animation-name:bounce_circularG;
animation-duration:0.64s;
animation-duration:0.56s;
animation-iteration-count:infinite;
animation-direction:linear;
}
@ -39,46 +38,26 @@
#circularG_1{
left:0;
top:18px;
-moz-animation-delay:0.24s;
-webkit-animation-delay:0.24s;
-ms-animation-delay:0.24s;
-o-animation-delay:0.24s;
animation-delay:0.24s;
-moz-animation-delay:0.7s;
-webkit-animation-delay:0.7s;
-ms-animation-delay:0.7s;
-o-animation-delay:0.7s;
animation-delay:0.7s;
}
#circularG_2{
left:5px;
top:5px;
-moz-animation-delay:0.32s;
-webkit-animation-delay:0.32s;
-ms-animation-delay:0.32s;
-o-animation-delay:0.32s;
animation-delay:0.32s;
-moz-animation-delay:0.63s;
-webkit-animation-delay:0.63s;
-ms-animation-delay:0.63s;
-o-animation-delay:0.63s;
animation-delay:0.63s;
}
#circularG_3{
top:0;
left:18px;
-moz-animation-delay:0.4s;
-webkit-animation-delay:0.4s;
-ms-animation-delay:0.4s;
-o-animation-delay:0.4s;
animation-delay:0.4s;
}
#circularG_4{
right:5px;
top:5px;
-moz-animation-delay:0.48s;
-webkit-animation-delay:0.48s;
-ms-animation-delay:0.48s;
-o-animation-delay:0.48s;
animation-delay:0.48s;
}
#circularG_5{
right:0;
top:18px;
-moz-animation-delay:0.56s;
-webkit-animation-delay:0.56s;
-ms-animation-delay:0.56s;
@ -86,34 +65,54 @@
animation-delay:0.56s;
}
#circularG_4{
right:5px;
top:5px;
-moz-animation-delay:0.49s;
-webkit-animation-delay:0.49s;
-ms-animation-delay:0.49s;
-o-animation-delay:0.49s;
animation-delay:0.49s;
}
#circularG_5{
right:0;
top:18px;
-moz-animation-delay:0.42s;
-webkit-animation-delay:0.42s;
-ms-animation-delay:0.42s;
-o-animation-delay:0.42s;
animation-delay:0.42s;
}
#circularG_6{
right:5px;
bottom:5px;
-moz-animation-delay:0.64s;
-webkit-animation-delay:0.64s;
-ms-animation-delay:0.64s;
-o-animation-delay:0.64s;
animation-delay:0.64s;
-moz-animation-delay:0.35s;
-webkit-animation-delay:0.35s;
-ms-animation-delay:0.35s;
-o-animation-delay:0.35s;
animation-delay:0.35s;
}
#circularG_7{
left:18px;
bottom:0;
-moz-animation-delay:0.72s;
-webkit-animation-delay:0.72s;
-ms-animation-delay:0.72s;
-o-animation-delay:0.72s;
animation-delay:0.72s;
-moz-animation-delay:0.28s;
-webkit-animation-delay:0.28s;
-ms-animation-delay:0.28s;
-o-animation-delay:0.28s;
animation-delay:0.28s;
}
#circularG_8{
left:5px;
bottom:5px;
-moz-animation-delay:0.8s;
-webkit-animation-delay:0.8s;
-ms-animation-delay:0.8s;
-o-animation-delay:0.8s;
animation-delay:0.8s;
-moz-animation-delay:0.21s;
-webkit-animation-delay:0.21s;
-ms-animation-delay:0.21s;
-o-animation-delay:0.21s;
animation-delay:0.21s;
}
@-moz-keyframes bounce_circularG{

2
app/views/navigation/offices.html
View File

@ -8,7 +8,6 @@
</ul>
<input ng-model="filterText" type="text" class="span marginbottom3px" placeholder="{{'label.filterbyname' | translate}}"/>
<div class="span4">
<div class="affix">
<div>
<div>
<button type="button" class="collapse-header-main" data-ng-click="collapseOthers()"><strong>{{'label.offices' | translate}}&nbsp;&nbsp;({{officeName}})</strong>&nbsp;&nbsp;&nbsp;&nbsp;<span class="pull-right"><i class="icon-chevron-up" data-ng-show="!isCollapsed"></i><i class="icon-chevron-down" data-ng-show="isCollapsed"></i></span></button>
@ -69,7 +68,6 @@
</table>
</div>
</div>
</div>
</div>
<div class="span7">
<div ng-show="office">

1
app/views/organization/currencyconfig.html
View File

@ -37,6 +37,7 @@
ng-model="selected"
placeholder="New Currency"
type="text"
ng-autofocus="true"
typeahead="item as item.displayLabel for item in allCurrOptions | filter:$viewValue | limitTo:8" />&nbsp;&nbsp;<a ng-click='addCur()'><i class="icon-plus"></i></a>
<div ng-repeat="currency in selectedCurrOptions">

7
app/views/system/audit.html
View File

@ -5,10 +5,10 @@
</ul>
<div class="row-fluid" >
<span class="input-append grpinputicons" >
<span><a ng-click="isCollapsed = !isCollapsed" class="btn blockoverlaywidth control">{{'label.searchoptions' | translate}}<i class="icon-chevron-down"></i></a></span>
<span><a ng-click="search()" class="btn btn-primary control"><i class="icon-search icon-white"></i></a></span>
<input ng-autofocus="true" typeahead-on-select="viewUser($item)" placeholder="{{'label.searchbyuser' | translate}}" type="text" ng-model="user" typeahead="users.username as users.username for users in template.appUsers | filter:$viewValue | limitTo:8"/>
<span><a ng-click="isCollapsed = !isCollapsed" class="btn control"><i class="icon-chevron-down"></i></a></span>
<span><a ng-click="search()" class="btn btn-primary control"><i class="icon-search icon-white"></i></a></span>
</span>
</div>
<div collapse="isCollapsed" class="blockoverlay" width="100%" style="overflow-y: scroll">
<div class="control-group">
<div class="controls">
@ -82,6 +82,7 @@
<input type="text" placeholder="{{'label.checkedto' | translate}}" datepicker-pop="dd MMMM yyyy" ng-model="date.fourth" is-open="opened3" min="minDate" max="'2020-06-22'" date-disabled="disabled(date, mode)" />
</div>
</div>
<span><a ng-click="search()" class="btn btn-primary control"><i class="icon-search icon-white"></i>{{'label.advancesearch' | translate}}</a></span>
</div>
<div ng-show="displayResults" class="row-fluid">
<table class="table">

1
app/views/tasks.html
View File

@ -165,7 +165,6 @@
<td class="pointer" data-ng-click="routeTo(data.id)">{{data.maker}}</td>
<td class="pointer" data-ng-click="routeTo(data.id)">{{data.actionName}}</td>
<td class="pointer" data-ng-click="routeTo(data.id)">{{data.entityName}}</td>
</tr>
</tbody>
</table>