Skip to content

Commit

Permalink
Merge pull request #182 from datasci4health/development
Browse files Browse the repository at this point in the history 
Fixes #180
  • Loading branch information
@santanche
santanche authored Aug 17, 2020
2 parents caed811 + d572368 commit 8ca6d44
Show file tree
Hide file tree
Showing 4 changed files with 188 additions and 182 deletions.
307 changes: 178 additions & 129 deletions src/adonisjs/app/Controllers/Http/CaseController.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,144 +5,193 @@ const axios = use("axios")
const View = use('View')

View.global('currentTime', function () {
return ("asease")
})
//return ("asease")
})

class CaseController {

create({ view }){
return view.render('author.author')
}
create({ view }){
return view.render('author.author')
}


async fetch ({ view }) {
async fetch ({ view }) {

const harena_manager_url = Env.get("HARENA_MANAGER_URL", "http://127.0.0.1:1020");
const cases_url = harena_manager_url + "/cases"
const cases = axios.get(cases_url)
.then((reponse) => {
console.log(reponse)
}, (error) => {
console.log(error)
})
}
const harena_manager_url = Env.get("HARENA_MANAGER_URL", "http://127.0.0.1:1020");
const cases_url = harena_manager_url + "/cases"
const cases = axios.get(cases_url)
.then((reponse) => {
console.log(reponse)
}, (error) => {
console.log(error)
})
}



async store ({request, session, response}) {
try {
const params = request.all()
//console.log("-------------------------------------------------------------------------------------------------------")
//console.log(request.cookie('token'))
const endpoint_url = Env.get("HARENA_MANAGER_URL") + "/api/v1/case"

console.log("******************************************** token from Adonis");
console.log(request.cookie('token'));
console.log(params)
let token = request.cookie('token')

// load template
let templateRequest = {
method: "GET",
url: Env.get("HARENA_SPACE_URL") + "/templates/" +
params.template + ".md",
headers: {
"Authorization": "Bearer " + request.cookie("token")
}
};
let markdown = null;
await axios(templateRequest)
.then(function (endpointResponse) {
console.log("================== markdown");
console.log(endpointResponse.data);
markdown = endpointResponse.data;
})
.catch(function (error) {
console.log(error);
});

if (markdown != null) {
const config = {
method: "POST",
url: endpoint_url,
data: {
title: params.case_title,
description: params.description,
language: params.language,
domain: params.domain,
specialty: params.specialty,
keywords: params.keywords,
source: markdown,
original_date: params.creationDate
},
headers: {
'Authorization': 'Bearer ' + token
}
}
await axios(config)
.then(function (endpoint_response) {
// return response.redirect('/author/author.html')
return response.redirect('/home')
})
.catch(function (error) {
console.log(error);
});
}
async store ({request, session, response}) {
try {
const params = request.all()
//console.log("-------------------------------------------------------------------------------------------------------")
//console.log(request.cookie('token'))
const endpoint_url = Env.get("HARENA_MANAGER_URL") + "/api/v1/case"

console.log("******************************************** token from Adonis");
console.log(request.cookie('token'));
console.log(params)
let token = request.cookie('token')

// load template
let templateRequest = {
method: "GET",
url: Env.get("HARENA_SPACE_URL") + "/templates/" +
params.template + ".md",
headers: {
"Authorization": "Bearer " + request.cookie("token")
}
catch (e) {
console.log(e)
};
let markdown = null;
await axios(templateRequest)
.then(function (endpointResponse) {
console.log("================== markdown");
console.log(endpointResponse.data);
markdown = endpointResponse.data;
})
.catch(function (error) {
console.log(error);
});

if (markdown != null) {
const config = {
method: "POST",
url: endpoint_url,
data: {
title: params.case_title,
description: params.description,
language: params.language,
domain: params.domain,
specialty: params.specialty,
keywords: params.keywords,
source: markdown,
original_date: params.creationDate
},
headers: {
'Authorization': 'Bearer ' + token
}
}
// return response.redirect('/author')
await axios(config)
.then(function (endpoint_response) {
// return response.redirect('/author/author.html')
return response.redirect('/home')
})
.catch(function (error) {
console.log(error);
});
}
}
catch (e) {
console.log(e)
}
// return response.redirect('/author')
}


async update ({request, session, response}) {
try {
const params = request.all();
console.log("-------------------------------------------------------------------------------------------------------");
console.log("=== params");
console.log(params);

//console.log("-------------------------------------------------------------------------------------------------------")
//console.log(request.cookie('token'))
const endpoint_url =
Env.get("HARENA_MANAGER_URL") + "/api/v1/case/" + params.case_id;

// console.log(request.cookie('token'))
let token = request.cookie('token')
const config = {
method: "PUT",
url: endpoint_url,
data: {
title: params.case_title,
description: params.description,
language: params.language,
domain: params.domain,
specialty: params.specialty,
keywords: params.keywords,
originalDate: params.originalDate,
source: params.source
},
headers: {
'Authorization': 'Bearer ' + token
}
}

await axios(config)
.then(function (endpoint_response) {
// return response.redirect('/author/author.html')
//return response.redirect('/')

})
.catch(function (error) {
console.log(error);
});
async update ({request, session, response}) {
try {
const params = request.all();
console.log("-------------------------------------------------------------------------------------------------------");
console.log("=== params");
console.log(params);

//console.log("-------------------------------------------------------------------------------------------------------")
//console.log(request.cookie('token'))
const endpoint_url =
Env.get("HARENA_MANAGER_URL") + "/api/v1/case/" + params.case_id;

// console.log(request.cookie('token'))
let token = request.cookie('token')
const config = {
method: "PUT",
url: endpoint_url,
data: {
title: params.case_title,
description: params.description,
language: params.language,
domain: params.domain,
specialty: params.specialty,
keywords: params.keywords,
originalDate: params.originalDate,
source: params.source
},
headers: {
'Authorization': 'Bearer ' + token
}
catch (e) {
console.log(e)
}
}

await axios(config)
.then(function (endpoint_response) {
// return response.redirect('/author/author.html')
//return response.redirect('/')

})
.catch(function (error) {
console.log(error);
});

}
catch (e) {
console.log(e)
}
}

async getCase({view, request, response}){
try{
// const params = request.all();

const endpoint_url = Env.get("HARENA_MANAGER_URL") + "/api/v1/case/" +
request.input("id");
// "d2ad02da-b7e1-4391-9f65-4f93eeb4ca7f"

var config = {
method: 'get',
url: endpoint_url,
headers: {
'Authorization': 'Bearer ' + request.cookie('token')
}
};


await axios(config)
.then(function (endpoint_response) {

// DCCCommonServer.setCaseObj(endpoint_response);

console.log('=====GET selected case:'+endpoint_response.status)
//return view.render('author.author')
let responseContent = endpoint_response.data
let caseId = responseContent.id
let caseTitle = responseContent.title
let caseDescription = responseContent.description
let caseLanguage = responseContent.language
let caseInstitution = responseContent.institution
let caseDomain = responseContent.domain
let caseSpecialty = responseContent.specialty
let caseKeywords = responseContent.keywords
let caseOriginalDate = responseContent.original_date
let caseSource = responseContent.source.replace(/"/gm, '\\"')
console.log('THIS IS CASE SOURCE ====================');
console.log(caseSource);
return view.render('author.author',
{caseId, caseTitle, caseDescription, caseLanguage, caseInstitution, caseDomain, caseSpecialty, caseKeywords, caseOriginalDate, caseSource})
})
.catch(function (error) {
console.log(error);
});
} catch(e){
console.log(e)
}
return view.render('author.author');
}

async populate_modal({ params, request, view, response }) {
try{
Expand All @@ -160,16 +209,16 @@ class CaseController {


await axios(config)
.then(function (endpoint_response) {
console.log(endpoint_response.data)
//return view.render('author.author')
.then(function (endpoint_response) {
console.log(endpoint_response.data)
//return view.render('author.author')


return view.render('author.author')
})
.catch(function (error) {
console.log(error);
});
return view.render('author.author')
})
.catch(function (error) {
console.log(error);
});
} catch(e){
console.log(e)
}
Expand Down
7 changes: 4 additions & 3 deletions src/adonisjs/public/author/js/draft.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,11 @@ class DraftManager {
await DCCNoticeInput.displayNotice(
"Are you sure that you want to delete this case? (write yes or no)",
"input");
if (decision.toLowerCase() == "yes")
if (decision.toLowerCase() == "yes"){
await MessageBus.ext.request("data/case/" + message + "/delete");
const box = this._boxesPanel.querySelector("#b" + message);
this._boxesPanel.removeChild(box);
const box = this._boxesPanel.querySelector("#b" + message);
this._boxesPanel.removeChild(box);
}
}

async downloadCase(topic, message) {
Expand Down
4 changes: 3 additions & 1 deletion src/adonisjs/resources/views/layout/partials/settings-modal.edge
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
{{ csrfField() }}

<input type="hidden" id="case_id" name="case_id" value="{{caseId}}">
<input type="hidden" id="case_source" name="case_source" value="{{caseSource}}">

<div class="form-group">
<label for="case-title">Title</label>
<input type="text" class="form-control" id="case_title" name="case_title" value="{{caseTitle}}" placeholder="Enter the title">
Expand Down Expand Up @@ -48,7 +50,7 @@
<textarea class="form-control" id="keywords" name="keywords" aria-describedby="keywords-help">{{caseKeywords}}</textarea>
<small id="keywords-help" class="form-text text-muted">Inform your keywords separated by semicolon.</small>
</div>

<input type="hidden" id="source" name="source">
<button type="submit" class="btn btn-secondary" id="btn-save-settings" data-toggle="modal" data-target="#settings-modal">Save</button>
<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
Expand Down
Loading

0 comments on commit 8ca6d44

Please sign in to comment.