Skip to content

Commit

Permalink
Working on new services
Browse files Browse the repository at this point in the history
  • Loading branch information
@rubendel
rubendel committed Nov 2, 2016
1 parent 88b762c commit fc79698
Show file tree
Hide file tree
Showing 8 changed files with 146 additions and 97 deletions.
3 changes: 2 additions & 1 deletion 3dview.html
View file
Expand Up @@ -74,6 +74,7 @@ <h3 class="panel-title">Visualization options</h3>
if (sceneJsNode != null) {
sceneJsNode.nodeId = sceneJsNode.id;
o.viewer.getControl("BIMSURFER.Control.ClickSelect").pick(sceneJsNode);

}
};

Expand Down Expand Up @@ -377,7 +378,7 @@ <h3 class="panel-title">Visualization options</h3>
this.resize = function(){
var resizeBtn = containerDiv.find(".btnResize");
var fullscreen = !resizeBtn.hasClass("glyphicon-resize-full");
var width = Math.round($(window).width() / 3 * 2 - 28);
var width = Math.round($(window).width() / 3 * 2 - 29);
$(".overlay-controls").css("top", fullscreen ? 10 : 120);
var height = ($(window).height() - $(".navbar").outerHeight() - $(".navbar-header").outerHeight() - $(".rightpanel .panel-heading").outerHeight() - 7) + (fullscreen ? 113 : 0);
$("div#viewport").width(width + "px");
Expand Down
31 changes: 10 additions & 21 deletions addnewservice2.html
View file
Expand Up @@ -39,7 +39,7 @@
</div>
</div>
<div class="button-bar-bottom">
<button class="btn btn-primary pull-right btn-lg btnNext">Next</button>
<button class="btn btn-primary pull-right btnNext">Next</button>
</div>
</div>
<script>
Expand Down Expand Up @@ -91,16 +91,16 @@
}
map.push(mapping);
});
console.log(availableLocalOutputs);
serviceDescriptor.inputs.forEach(function(input, index){
var tr = $("<tr>");
tr.attr("input", input);
var td = $("<td>");
var radio = $("<input type=\"radio\">");
radio.attr("id", "input" + index);
radio.attr("name", "inputformat");
td.append(radio);
tr.append(td);
tr.append("<td>" + input + "</td>");
tr.append("<td><label for=\"input" + index + "\">" + input + "</label></td>");
var mappings = availableLocalOutputs[input.toUpperCase()];
var td = $("<td>");
tr.append(td);
Expand Down Expand Up @@ -129,10 +129,11 @@
tr.attr("output", output);
var td = $("<td>");
var radio = $("<input type=\"radio\">");
radio.attr("id", "output" + index);
radio.attr("name", "outputformat");
td.append(radio);
tr.append(td);
tr.append("<td>" + output + "</td>");
tr.append("<td><label for=\"output" + index + "\">" + output + "</label></td>");
var td = $("<td>");
tr.append(td);
var select = $("<select class=\"form-control\">");
Expand All @@ -149,7 +150,7 @@
});

cd.find(".btnNext").click(function(){
var output = cd.find(".outputsTable input[checked='checked']").parents("tr").attr("output");
var output = cd.find(".outputsTable input:checked").parents("tr").attr("output");
var request = {
poid: project.oid,
sService: {
Expand All @@ -161,29 +162,17 @@
authorizationUrl: serviceDescriptor.authorizationUrl,
resourceUrl: serviceDescriptor.resourceUrl,
registerUrl: serviceDescriptor.registerUrl,
input: cd.find(".inputsTable input[checked='checked']").parents("tr").attr("input"),
input: cd.find(".inputsTable input:checked").parents("tr").attr("input"),
status: "NEW",
oauthCode: "",
serializerId: parseInt(cd.find(".inputsTable input[checked='checked']").parents("tr").find("select").val()),
serializerId: parseInt(cd.find(".inputsTable input:checked").parents("tr").find("select").val()),
output: output,
action: cd.find(".outputsTable input[checked='checked']").parents("tr").find("select").val()
action: cd.find(".outputsTable input:checked").parents("tr").find("select").val()
}
};
Global.bimServerApi.call("ServiceInterface", "addNewServiceToProject", request, function(){

projectPage.rightPanel.loadServices(function(){}, true);
});

var extendedDataSchema = {
__type: "SExtendedDataSchema",
name: output,
namespace: output,
url: output,
type: "TXT"
};
Global.bimServerApi.callWithNoIndication("ServiceInterface", "addExtendedDataSchema", {extendedDataSchema: extendedDataSchema}, function(oid){
});

projectPage.rightPanel.loadServices(function(){}, true);
});
}
</script>
44 changes: 10 additions & 34 deletions addservice3.html
View file
Expand Up @@ -128,54 +128,30 @@ <h3>Model Checkers</h3>
var td1 = $("<td></td>");
tr1.append(td1);
$(".addservice3 .rightsTable").append(tr1);
Global.bimServerApi.call("ServiceInterface", "getExtendedDataSchemaByNamespace", {namespace: serviceDescriptor.readExtendedData}, function(data){
Global.bimServerApi.call("ServiceInterface", "getExtendedDataSchemaByName", {name: serviceDescriptor.readExtendedData}, function(data){
othis.readExtendedDataOid = data.oid;
td1.append(main.createExtendedDataSchemaLink(data));
}, function(){
othis.addExtendedDataSchema(serviceDescriptor.readExtendedData, function(data){
othis.readExtendedDataOid = data.oid;
td1.append(main.createExtendedDataSchemaLink(data));
othis.canAdd();
}, function(){
tr1.addClass("error");
td1.append("<br/>Error adding extended data schema");
});
}, function(data){
othis.readExtendedDataOid = data.oid;
td1.append(main.createExtendedDataSchemaLink(data));
othis.canAdd();
}, false, false, false);
}
if (serviceDescriptor.writeExtendedData != null) {
var tr2 = $("<tr><td>Write Extended Data</td></tr>");
var td2 = $("<td></td>");
tr2.append(td2);
$(".addservice3 .rightsTable").append(tr2);
Global.bimServerApi.call("ServiceInterface", "getExtendedDataSchemaByNamespace", {namespace: serviceDescriptor.writeExtendedData}, function(data){
Global.bimServerApi.call("ServiceInterface", "getExtendedDataSchemaByName", {name: serviceDescriptor.writeExtendedData}, function(data){
othis.writeExtendedDataOid = data.oid;
td2.append(main.createExtendedDataSchemaLink(data));
}, function(){
othis.addExtendedDataSchema(serviceDescriptor.writeExtendedData, function(data){
othis.writeExtendedDataOid = data.oid;
td2.append(main.createExtendedDataSchemaLink(data));
othis.canAdd();
}, function(){
tr1.addClass("error");
td2.append("<br/>Error adding extended data schema");
});
}, function(data){
othis.writeExtendedDataOid = data.oid;
td2.append(main.createExtendedDataSchemaLink(data));
othis.canAdd();
}, false, false, false);
}

this.addExtendedDataSchema = function(namespaceurl, callback, errorCallback){
var extendedDataSchema = {
__type: "SExtendedDataSchema",
name: namespaceurl,
namespace: namespaceurl,
url: namespaceurl,
type: "TXT"
};
Global.bimServerApi.call("ServiceInterface", "addExtendedDataSchema", {extendedDataSchema: extendedDataSchema}, function(oid){
extendedDataSchema.oid = oid
callback(extendedDataSchema);
}, errorCallback);
};

this.addProfileDescriptor = function(profileDescriptor) {
$(".addservice3 .noprofiles").hide();
$(".addservice3 .profilesTable").show();
Expand Down
8 changes: 8 additions & 0 deletions css/main.css
View file
Expand Up @@ -514,8 +514,16 @@ input[type="file"].file {
border-top-right-radius: 0;
}

.addnewservice2 label {
cursor: pointer;
font-weight: normal;
}

.button-bar-bottom {
height: 26px;
margin-top: 10px;
margin-bottom: 10px;
clear: both;
}

.extendeddata .bcf .col-xs-6.right {
Expand Down
7 changes: 4 additions & 3 deletions js/pagechanger.js
View file
Expand Up @@ -82,6 +82,7 @@ function TabChanger2(navElement, mainContainer) {
othis.currentContentElement = null;

this.changeTab = function(linkElement, page, contentElement, constructorFunction, callback) {
console.log("changetab", page, contentElement);
if (othis.currentContentElement != null && contentElement != null && othis.currentContentElement.get(0) == contentElement.get(0)) {
if (typeof page == "string") {
othis.current = constructorFunction.call(contentElement);
Expand Down Expand Up @@ -109,7 +110,7 @@ function TabChanger2(navElement, mainContainer) {
console.log(response, xhr.status, xhr.statusText);
} else {
othis.current = constructorFunction.call(this);
contentElement.show();
contentElement.show(true);
if (callback != null) {
callback.call(othis.current);
}
Expand All @@ -118,7 +119,7 @@ function TabChanger2(navElement, mainContainer) {
} else {
othis.current = page;
contentElement.append(page);
contentElement.show();
contentElement.show(true);
if (callback != null) {
callback.call(othis.current);
}
Expand All @@ -128,7 +129,7 @@ function TabChanger2(navElement, mainContainer) {
if (callback != null) {
callback.call(othis.current);
}
contentElement.show();
contentElement.show(true);
}
othis.currentContentElement = contentElement;
};
Expand Down
79 changes: 66 additions & 13 deletions newservice.html
View file
@@ -1,17 +1,70 @@
<div class="newservice">
<div class="servicestatus"></div>
<div class="button-bar">
<div class="btn-group">
<button type="button" class="btn btn-primary triggerBtn">Trigger on last revision</button>
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="caret"></span> <span class="sr-only">Toggle Dropdown</span>
</button>
<ul class="dropdown-menu revisionsUl">
</ul>
</div>
</div>
</div>
<script>
function NewService(main, service, serverId) {
var o = this;

var code = QueryString.code;

Global.bimServerApi.call("OAuthInterface", "getRemoteToken", {
soid: service.oid,
code: code,
serverId: serverId
}, function(result){
console.log(result);
});
}
function NewService(cd, main, service, serverId) {
var o = this;

this.formatNewServiceStatus = function(status) {
if (status == "NEW") {
return "<span class=\"label label-warning\">Not authenticated</span>";
} else if (status == "AUTHENTICATED") {
return "<span class=\"label label-success\">Authenticated</span>";
}
};

var code = QueryString.code;

this.trigger = function(){
var roid = $(this).data("roid");
Global.bimServerApi.callWithFullIndication("ServiceInterface", "triggerRevisionService", {
roid: roid,
soid: service.oid
}, function(){

});
};

if (service.status != "AUTHENTICATED" && code != null) {
Global.bimServerApi.call("OAuthInterface", "getRemoteToken", {
soid : service.oid,
code : code,
serverId : serverId
}, function(result) {
Global.bimServerApi.call("ServiceInterface", "getNewService", {
soid : service.oid
}, function(service) {
cd.find(".servicestatus").append(o.formatNewServiceStatus(service.status));
});
});
}

Global.bimServerApi.call("ServiceInterface", "getAllRevisionsOfProject", {
poid: service.projectId
}, function(data){
data.forEach(function(revision, index){
if (index == data.length - 1) {
cd.find(".triggerBtn").data("roid", revision.oid);
}
var li = $("<li>");
var a = $("<a>Trigger on " + revision.id + " (" + revision.comment + ")</a>");
a.data("roid", revision.oid);
a.click(o.trigger);
li.append(a);
cd.find(".revisionsUl").prepend(li);
});
});

cd.find(".triggerBtn").click(o.trigger);
}
</script>
4 changes: 2 additions & 2 deletions project.html
View file
Expand Up @@ -402,12 +402,12 @@
main.showAddProject(null, project);
});
}).find("a").prepend("<i class=\"glyphicon glyphicon-tree-conifer\"></i> ");
othis.navigator.projecttree.addMenuItem("Add service", "btnAddService", function(){
othis.navigator.projecttree.addMenuItem("Add old service", "btnAddService", function(){
othis.rightPanel.showAddService(othis.navigator.projecttree.selectedNode.project, null, function(){
othis.rightPanel.loadServices();
});
}).find("a").prepend("<i class=\"glyphicon glyphicon-cloud\"></i> ");
othis.navigator.projecttree.addMenuItem("Add service 2", "btnAddService2", function(){
othis.navigator.projecttree.addMenuItem("Add new service", "btnAddService2", function(){
othis.rightPanel.showAddService2(othis.navigator.projecttree.selectedNode.project, null, function(){
othis.rightPanel.loadServices();
});
Expand Down

0 comments on commit fc79698

Please sign in to comment.