|
@@ -855,6 +855,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
|
855
|
855
|
if (JSON.parse(sessionStorage.getItem("searchincident")).incident) {
|
856
|
856
|
$scope.searchkeys = JSON.parse(sessionStorage.getItem("searchincident")).incident;
|
857
|
857
|
}
|
|
858
|
+
|
858
|
859
|
if ($scope.searchkeys.acceptDate) {
|
859
|
860
|
$scope.searchkeys.acceptDate = new Date($scope.searchkeys.acceptDate);
|
860
|
861
|
}
|
|
@@ -2682,6 +2683,8 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
|
2682
|
2683
|
console.log($state);
|
2683
|
2684
|
if($state.params.tab){
|
2684
|
2685
|
$scope.searchstate = $state.params.tab;
|
|
2686
|
+ }else if (sessionStorage.searchincident && JSON.parse(sessionStorage.getItem("searchincident")).searchType) {
|
|
2687
|
+ $scope.searchstate = JSON.parse(sessionStorage.getItem("searchincident")).searchType;
|
2685
|
2688
|
}else{
|
2686
|
2689
|
$scope.searchstate = 'all';
|
2687
|
2690
|
}
|
|
@@ -2774,6 +2777,8 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
|
2774
|
2777
|
$scope.searchstate = $state.params.tab;
|
2775
|
2778
|
filterData.searchType = $state.params.tab;
|
2776
|
2779
|
sessionStorage.setItem('searchincident',JSON.stringify(filterData));
|
|
2780
|
+ }else if (sessionStorage.searchincident && JSON.parse(sessionStorage.getItem("searchincident")).searchType) {
|
|
2781
|
+ $scope.searchstate = JSON.parse(sessionStorage.getItem("searchincident")).searchType;
|
2777
|
2782
|
}else{
|
2778
|
2783
|
$scope.searchstate = filterData.searchType;
|
2779
|
2784
|
}
|