Skip to content

Commit

Permalink
search
Browse files Browse the repository at this point in the history
  • Loading branch information
LiuXiangyu authored and cairijun committed Oct 26, 2014
1 parent b0c5bdf commit 3b71b16
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 24 deletions.
2 changes: 1 addition & 1 deletion server/static/css/circuit.css
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ body {
}

#right-container .ui.items {
height:95%;
height:88%;
overflow:auto;
width:425px;
}
Expand Down
66 changes: 44 additions & 22 deletions server/static/js/circuit.js
Original file line number Diff line number Diff line change
Expand Up @@ -842,7 +842,7 @@ function Inputselector() {
this.steps = $("#chose-steps > .step");
this.steps.addClass("disabled");
this.search = $("#inputpart > .search");
this.searchinput = $("#inputpart > .search > input");
this.searchinput = $("#searchinput");
this.currentstep = $("#chose-steps > .first");
this.index = 0;
this.inputpart = $("#inputpart");
Expand Down Expand Up @@ -912,30 +912,29 @@ Inputselector.prototype.nextstep = function() {
var bio = new Biobrick(this, this.arr[i]);
this.biolist.append(bio.view);
}
if (this.index == 1 || this.index == 2) {
this.search.show();
this.searchinput.keyup(function() {
var type = ["promoter", "receptor"];
if (that.searchinput.val() != "") {
$.ajax({
type: "GET",
url: "/biobrick/search/" + type[that.index - 2] + "/" + that.searchinput.val(),
}).done(function(data) {
that.biolist.empty();
for (var i = 0; i < data.result.length; ++i) {
var bio = new Biobrick(that, data.result[i]);
that.biolist.append(bio.view);
}
});
} else {
this.search.show();
this.searchinput.val("");
this.searchinput.keyup(function() {
var type = ["input", "promoter", "receptor"];
if (that.searchinput.val() != "") {
$.ajax({
type: "GET",
url: "/biobrick/search/" + type[that.index - 1] + "/" + that.searchinput.val(),
}).done(function(data) {
that.biolist.empty();
for (var i = 0; i < that.arr.length; ++i) {
var bio = new Biobrick(that, that.arr[i]);
for (var i = 0; i < data.result.length; ++i) {
var bio = new Biobrick(that, data.result[i]);
that.biolist.append(bio.view);
}
});
} else {
that.biolist.empty();
for (var i = 0; i < that.arr.length; ++i) {
var bio = new Biobrick(that, that.arr[i]);
that.biolist.append(bio.view);
}
});
}
}
});
} else {
var newpart = new Part(this.result);
this.biolist.append(newpart.view);
Expand All @@ -954,14 +953,37 @@ Inputselector.prototype.nextstep = function() {
function Outputselector() {
var that = this;
this.outputlist = olist;
this.data;
this.searchoutput = $("#searchoutput");
$.ajax({
url:"biobrick/output",
}).done(function(data) {
that.data = data["result"];
for (var i = 0; i < data["result"].length; ++i) {
var outp = new Output(data["result"][i]);
that.outputlist.append(outp.view);
}
});
});
this.searchoutput.keyup(function() {
if (that.searchoutput.val() != "") {
$.ajax({
type: "GET",
url: "/biobrick/search/output/" + that.searchoutput.val(),
}).done(function(data) {
that.outputlist.empty();
for (var i = 0; i < data.result.length; ++i) {
var bio = new Output(data.result[i]);
that.outputlist.append(bio.view);
}
});
} else {
that.outputlist.empty();
for (var i = 0; i < that.data.length; ++i) {
var bio = new Output(that.data[i]);
that.outputlist.append(bio.view);
}
}
});
}

/**
Expand Down
6 changes: 5 additions & 1 deletion server/templates/layout.html
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
</div>
<div id="inputpart">
<div class="ui icon input search">
<input type="text" placeholder="Search All">
<input type="text" placeholder="Search All" id="searchinput">
<i class="search icon"></i>
</div>
</div>
Expand All @@ -61,6 +61,10 @@
Output
</div>
<div class="content">
<div class="ui icon input search">
<input type="text" placeholder="Search All" id="searchoutput">
<i class="search icon"></i>
</div>
<div class="ui items" id="outputlist">
</div>
</div>
Expand Down

0 comments on commit 3b71b16

Please sign in to comment.