Skip to content
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

Drag drop #4

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Drag drop #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1974e8a
minor updates
tpook92 Nov 5, 2019
135d544
Drag and Drop related code.
AmGanesan Nov 6, 2019
1a8eca8
drag and drop related code
AmGanesan Nov 6, 2019
c3979ec
Restore old version + clean up
tpook92 Nov 6, 2019
3074c4c
Merge branch 'Warnings_rework' of https://github.com/tpook92/MoBPS_we…
tpook92 Nov 6, 2019
ab0db89
recover old version
tpook92 Nov 6, 2019
62d0e45
drag and drop related
AmGanesan Nov 7, 2019
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
13 changes: 13 additions & 0 deletions DB_Scripts/DeleteUserDB.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
var MongoClient = require('mongodb').MongoClient;
var url = "mongodb://localhost:27017/";

MongoClient.connect(url, {useNewUrlParser: true }, function(err, db) {
if (err) throw err;
var dbo = db.db("DB");
var user = "Torsten";
dbo.collection(user).drop(function(err, delOK) {
if (err) throw err;
if (delOK) console.log("Collection deleted");
db.close();
});
});
4 changes: 2 additions & 2 deletions DB_Scripts/InsertMultipleUserDB.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ MongoClient.connect(url, {useNewUrlParser: true }, function(err, db) {
if (err) throw err;
var dbo = db.db("DB");
var myobj = [];
for(let i=70;i<=75; i++){
myobj.push({_id: "Test1"+i, passw: "Test1"+i, group:"2"});
for(let i=86;i<=90; i++){
myobj.push({_id: "GWDG"+i, passw: "GWDG"+i});
}
dbo.collection("Users").insertMany(myobj, function(err, res) {
if (err) throw err;
Expand Down
20 changes: 9 additions & 11 deletions DB_Scripts/InsertSingleUserDB.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,12 @@ var url = "mongodb://localhost:27017/";
MongoClient.connect(url, {useNewUrlParser: true }, function(err, db) {
if (err) throw err;
var dbo = db.db("DB");

dbo.collection("Users").insertOne(
{ _id: "Amudha4", passw: "Amudha4", group:"4"},

function(err, res) {
if (err) throw err;
db.close();
});
});


var myobj = [
{ _id: "amudha12", passw: "amudha11" },
];
dbo.collection("Users").insertMany(myobj, function(err, res) {
if (err) throw err;
console.log(res);
db.close();
});
});
4 changes: 2 additions & 2 deletions DB_Scripts/UpdateMultipleUserDB.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ MongoClient.connect(url, {useNewUrlParser: true }, function(err, db) {
var dbo = db.db("DB");

dbo.collection("Users").updateMany(
{group:"2"},
{$set : {group:"3"}},
{},
{$set : {group:"2"}},
{upsert:true}
);
if (err) throw err;
Expand Down
66 changes: 41 additions & 25 deletions mobps.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,11 @@
<script lang="javascript" src="javascript/xlsx_excelToArray.js"></script>
<script lang="javascript" src="javascript/excelToArray.js"></script>

</head>
<!-- for drag and drop for Phenotype table -->
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/[email protected]/Sortable.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/Vue.Draggable/2.16.0/vuedraggable.min.js"></script>

</head>

<body onload="init();">

Expand Down Expand Up @@ -68,7 +72,7 @@ <h3 id="runningDogTitle">
&nbsp;&nbsp;
<button class='bar_button' id="download_button" onclick="downloadNetwork()" >Download Project</button>
&nbsp;&nbsp;
<button class='bar_button' id="delete_button" onclick="deleteProject()" >Delete Project</button>
<button class='bar_button' id="delete_button" onclick="deleteProject()" style="color: red" >Delete Project</button>
&nbsp;&nbsp;
<button class='bar_button' v-on:click='show_geninfo = !show_geninfo; show_warnings = false;' >Show/Hide Info</button>
&nbsp;&nbsp;
Expand Down Expand Up @@ -499,43 +503,52 @@ <h3 id="Phenotype_Info"> Phenotype Information
<td></td>
</tr>
</thead>
<tbody>
<tr v-for='(trait, index) in traitsinfo' >
<table>
<draggable :list="traitsinfo"
class="dragArea"
:move="moveMatrix"
@change="seeChange"
@end="onEnd">
<template v-for='(trait, index) in traitsinfo' >
<tr>
<td>
<input v-model="trait['Trait Name']" style="width:80px;">
<input v-model="trait['Trait Name']" style="width:80px;height:20px;">
</td>
<td>
<input v-model="trait['Trait Unit']" style="width:50px;">
<input v-model="trait['Trait Unit']" style="width:50px;height:20px;">
</td>
<td>
<input v-model="trait['Trait Mean']" style="width:50px;" class="no-spinners" step=0.001 v-on:change="trait['Trait Mean'] = trait['Trait Mean'].replace(/,/g, '.')">
<input v-model="trait['Trait Mean']" style="width:90px;height:20px;" class="no-spinners" step=0.001 v-on:change="trait['Trait Mean'] = trait['Trait Mean'].replace(/,/g, '.')">
</td>
<td>
<input v-model="trait['Trait Std Deviation']" style="width:50px;" class="no-spinners" step=0.001 v-on:change="trait['Trait Std Deviation'] = trait['Trait Std Deviation'].replace(/,/g, '.')">
<input v-model="trait['Trait Std Deviation']" style="width:80px;height:20px;" class="no-spinners" step=0.001 v-on:change="trait['Trait Std Deviation'] = trait['Trait Std Deviation'].replace(/,/g, '.')">
</td>
<td>
<input v-model="trait['Trait Heritability']" max=1 min=0 style="width:50px;" class="no-spinners" step=0.0001 v-on:change="trait['Trait Heritability'] = trait['Trait Heritability'].replace(/,/g, '.')">
<input v-model="trait['Trait Heritability']" max=1 min=0 style="width:90px;height:20px;" class="no-spinners" step=0.0001 v-on:change="trait['Trait Heritability'] = trait['Trait Heritability'].replace(/,/g, '.')">
</td>
<td>
<input v-model="trait['Trait Number of Polygenic Loci']" style="width:50px;" class="no-spinners" step=1>
<input v-model="trait['Trait Number of Polygenic Loci']" style="width:100px;height:20px;" class="no-spinners" step=1>
</td>
<td>
<input v-model="trait['Trait Major QTL']" style="width:50px;" type="Number" class="no-spinners" step=1 v-on:change="createQTL(index)">
<input v-model="trait['Trait Major QTL']" style="width:100px;height:20px;" type="Number" class="no-spinners" step=1 v-on:change="createQTL(index)">
</td>
<td>
<input v-model="trait['Trait Value per Unit']" style="width:50px;" type="Number" class="no-spinners" step=0.001 v-on:change="trait['Trait Value per Unit'] = trait['Trait Value per Unit'].replace(/,/g, '.')">
<input v-model="trait['Trait Value per Unit']" style="width:110px;height:20px;" type="Number" class="no-spinners" step=0.001 v-on:change="trait['Trait Value per Unit'] = trait['Trait Value per Unit'].replace(/,/g, '.')">
</td>
<td>
<input type="checkbox" v-model="show_matrix_element[index].show">
<input type="checkbox" style="width:50px;height:20px;" v-model="show_matrix_element[index].show">
</td>
<td>
<button v-on:click="removePheno(index)">X</button>
</td>
</tr>
</tbody>
</table>
<br>
<template v-for="trait in traitsinfo" v-if="show_QTL && trait['Trait Major QTL'] > 0">
</template>
</draggable>
</table >

<br>

<template v-for="trait in traitsinfo" v-if="show_QTL && trait['Trait Major QTL'] > 0">
<table class="trait_table">
<thead>
<tr>
Expand Down Expand Up @@ -573,15 +586,13 @@ <h3 id="Phenotype_Info"> Phenotype Information
</template>

<br>
<table v-if="traitsinfo.length > 1 && show_matrix">
<tr>
<td style="font-weight:bold;width:60px;padding:5px;">Upload Excel file for Correlation:
<table >
<tr><td style="font-weight:bold;width:60px;">Upload Excel file for Correlation:
<span class="tooltip">&#9432 <span class="tooltiptext">"Here you can import an Excel file with genetic correlations above the diagonal and residual correlations below the diagonal. Please set "1" to the diagonal elements. The first row and first column should be name of the Phenotype."</span></span>
</td>
</tr>
</td></tr>
<tr>
<td> <input id="excelToArray" type=file ></td>
<td><button id="save_button" onclick="saveMatrixToProject();">Save to Project</button></td>
<td ><button id="save_button" onclick="saveProject(geninfo['Project Name']);loadData(geninfo['Project Name']);">Save to Project</button></td>
</tr>
</table>
<br>
Expand Down Expand Up @@ -610,8 +621,13 @@ <h3 id="Phenotype_Info"> Phenotype Information
</td>
</tr>
</table>
<br>

<table v-if="traitsinfo.length > 1 && show_matrix">
<tr><td> <button id="save_button" onclick="loadData(geninfo['Project Name']);">Refresh</button>
<span class="tooltip">&#9432 <span class="tooltiptext">Please click this button if the correlation values are not loaded!</span></span>
</td></tr>
</table>

<table v-if="traitsinfo.length > 1 && show_matrix">
<tr>
<td>
Expand Down Expand Up @@ -948,7 +964,7 @@ <h3 v-if="geninfo['advanced'] && geninfo['advanced_sub']"> Multiple Subpopulatio
<td>
<button v-on:click='removeQTLsub(subpop, subpop["QTL Info"], snp)'>X</button>
</td>
--->
-->
</tr>
</tbody>
</table>
Expand Down
9 changes: 8 additions & 1 deletion mobps.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,14 @@ app.post('/RsimResult', function(request, response) {
app.get('/Rdownload', function(request, res){
if (request.session.filename) {
var textfile = path.join(__dirname + '/Rmodules/UserScripts/'+request.session.username+'_'+request.session.filename+'.RData');
res.download(textfile);
fs.readFile(textfile, function(err, data){
if(err){
var message = 'Have not found any RData file for Project ' + request.session.filename +'. Please finish R Simulation successfully and then download RData.';
res.send(message.fontcolor("red"));
}else{
res.download(textfile);
}
});
} else {
res.send('Please select a project to download RData!');
}
Expand Down
Loading