Skip to content

get operators for manage app #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
priyankahdp wants to merge 1 commit into
base: master
Choose a base branch
from
Open

get operators for manage app #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 27 additions & 8 deletions components/jaggery-apps/manage/src/main/manage/modules/taskmanager/get.jag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,13 @@ var getTasks = function (filterCategory,taskType) {
createdTime:time,
date:dueDate
});}else{
var log = new Log();
log.info("HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH");

var mod = jagg.module("manager");
var storeHostObject = mod.getOperatorsHostObject(); //changed from get getstoreObj
var mod = jagg.module("manager");
var storeHostObject = mod.getOperatorsHostObject(); //changed from get getstoreObj
var appStatus = storeHostObject.getAppStatus(applicationIdVariable.value,operator.value);

if(appStatus == true){
task.push({
id:taskId,
Expand All @@ -89,7 +91,7 @@ var getTasks = function (filterCategory,taskType) {
});
}
}


}

Expand Down Expand Up @@ -412,7 +414,7 @@ function parseApplicationDetailsResponse(response, endpoint, taskId){
var tierAtt = tierAttribute[j];
var attName = tierAtt.*::tierAttributeName.text();
var attVal = tierAtt.*::tierAttributevalue.text();

if(attVal.length() == 0) {
attVal = tierAtt.*::tierAttributevalue.*;
}
Expand Down Expand Up @@ -520,7 +522,7 @@ function parseSubscriptionDetailsResponse(response, endpoint, taskId){
subscriptionDetails.taskId = task_id;

var SubscriptionApprovalData = new XML((response.*::taskData).toString());

var appId = SubscriptionApprovalData.*::applicationId.text();
var apiId = SubscriptionApprovalData.*::apiID.text();
var operatorId = SubscriptionApprovalData.*::operatorID.text();
Expand All @@ -534,7 +536,7 @@ function parseSubscriptionDetailsResponse(response, endpoint, taskId){
subscriptionDetails.applicationDescription = applicationDescription;
subscriptionDetails.subscriber = subscriber;
subscriptionDetails.apiNameVersion = apiName + " - " + apiVersion;

subscriptionDetails.appId = appId;
subscriptionDetails.apiId = apiId;
subscriptionDetails.operatorId = operatorId;
Expand Down Expand Up @@ -593,10 +595,27 @@ function getAllTiers(){
}
}

function getOperators(){
var log = new Log();
var billing = jagg.module("manager").getCustomBilling();
var operators = [];
try {
log.info("# # # Operators List LOADING. . .");
operators = billing.getOperators();
log.info("# # # Operators List: " + stringify(operators));
return {error:false, data : operators};

} catch (e) {
log.error(e.message);
return { error:true,message:e.message};
}
}


function getRatesList(apiName, opName){
var workflow, result;
workflow = jagg.module("manager").getWorkflowHostObject();

try {
result = workflow.getSubscriptionRatesForOperator(apiName, opName);
if (result == null) {
Expand Down
5 changes: 4 additions & 1 deletion components/jaggery-apps/manage/src/main/manage/modules/taskmanager/module.jag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ jagg.module("taskmanager", {
},
getRatesList:function () {
return jagg.require(jagg.getModulesDir() + "taskmanager/get.jag").getRatesList.apply(this, arguments);
},
},
getOperators:function () {
return jagg.require(jagg.getModulesDir() + "taskmanager/get.jag").getOperators.apply(this, arguments);
}
});
%>
49 changes: 22 additions & 27 deletions components/jaggery-apps/manage/src/main/manage/site/blocks/app-history/block.jag
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,45 +1,40 @@
<%
jagg.block("app-history", {
initializer:function (data) {

} ,
},
getInputs:function () {
return {
"usage":null
}
} ,
getOutputs:function (inputs) {
return {"usage":null}
},
getOutputs:function (inputs) {
var numberOfTasks, pageNumber, filterCategory,taskType, result, mod,tasks;

var data, user = inputs.user;
var operator ="%";
appid = request.getParameter("AppId");

var logedop = jagg.getUser().operator;
log = new Log();
log.info('############### OPERATOR : '+ logedop);

mod = jagg.module("approvalaudit");
var log = new Log();

var module = jagg.module("taskmanager");
var result_operators = module.getOperators();
log.info('############### ALL OPERATORS : '+ stringify(result_operators.data));

mod = jagg.module("approvalaudit");
if (user.isAdmin) {
operator = "%";
} else if (logedop.toUpperCase() == 'SENEGAL') {
operator = "1";
} else if (logedop.toUpperCase() == 'IVORYCOAST') {
operator = "1";
} else if (logedop.toUpperCase() == 'SENEGAL') {
operator = "2";
}

result = mod.getApprovalHistoryApp(appid,operator);
if(result==null){
tasks=null;
}
else{
tasks = result;
}
return {
"tasks":tasks
}
}

result = mod.getApprovalHistoryApp(appid,operator);
if(result==null){
tasks=null;
}else{
tasks = result;
}
return {
"tasks":tasks
}
}
});
%>
11 changes: 3 additions & 8 deletions components/jaggery-apps/manage/src/main/manage/site/blocks/finance/block.jag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,9 @@ jagg.block("finance", {
initializer:function (data) {

} ,
// getInputs:function () {
// return {
// "usage":null
// }
// },

getOutputs:function (inputs) {

var data, user = inputs.user;
var isOperator = jagg.getUser().operator;
var data_subscribers;
Expand All @@ -27,14 +22,14 @@ jagg.block("finance", {
var financeReportModule = jagg.module("finance-report");
var result_operators = financeReportModule.getOperatorsBySubscriber(jagg.getUser().username);
var result_applications = financeReportModule.getAppsBySubscriber(jagg.getUser().username);

data_operators = result_operators.data;
data_applications = result_applications.data;
}else if(isOperator != null){
var financeReportModule = jagg.module("finance-report");
var result_applications = financeReportModule.getAppsByOperator(isOperator);
var result_subscribers = financeReportModule.getSubscribersByOperator(isOperator);

data_operators = isOperator;
data_subscribers = result_subscribers.data;
data_applications = result_applications.data;
Expand Down
22 changes: 21 additions & 1 deletion ...nage/src/main/manage/site/themes/default/subthemes/dark/templates/app-history/js/tiers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ function getLblText(lblInfo){

function getAllTiers(lblText){
var action = "getAllTiers";

jagg.post("/site/blocks/app-history/ajax/tier-details.jag", {
action : action,
lblText : lblText
Expand All @@ -35,4 +35,24 @@ function setTierDetailsToToolTip(tierAttributevalue){
$("#tierattribute_tooltip").html(tierAttributevalue);
}

function getAllOperators(){
var action = "getAllOperators";

jagg.post("/site/blocks/app-history/ajax/tier-details.jag", {
action : action,
lblText : lblText
}, function(result) {
if (!result.error) {
if (result.data != null) {
setTierDetailsToToolTip(result.data);
} else {
jagg.showLogin();
}
} else {
jagg.showLogin();
}
}, "json");
}



4 changes: 0 additions & 4 deletions ...age/src/main/manage/site/themes/default/subthemes/dark/templates/app-history/template.jag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,6 @@
<td>IVORYCOAST :</td>
<%} else if (opcoapps[i].operatorid==2) {%>
<td>SENEGAL :</td>


<%}%>

<td colspan="2"><%=opcoapps[i].status%></td>
Expand Down Expand Up @@ -177,8 +175,6 @@
<%if (opcosubs[j].operatorid==1) {%>
<td>IVORYCOAST :</td>
<%} else if (opcosubs[j].operatorid==2) {%>


<td>SENEGAL :</td>
<%}%>

Expand Down
Loading