Skip to content
This repository has been archived by the owner on Oct 5, 2023. It is now read-only.

Commit

Permalink
Merge branch 'master' of github.com:taktik/icure-backend
Browse files Browse the repository at this point in the history
  • Loading branch information
@aduchate
aduchate committed Jun 9, 2018
2 parents d07183f + 5392d46 commit 5c93083
Show file tree
Hide file tree
Showing 18 changed files with 69 additions and 63 deletions.
5 changes: 5 additions & 0 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,11 @@ dependencies {
compile name: 'probatron4j-custom-0.7.4'
compile name: 'ehvalidator-service-core-2.1.1'

//Cloud version
compile group: 'com.hazelcast', name: 'hazelcast', version: '3.8.6'
compile group: 'com.hazelcast', name: 'hazelcast-spring', version: '3.8.6'
compile group: 'org.springframework.session', name: 'spring-session', version: '1.3.3.RELEASE'

// Runtime
runtime group: 'org.javassist', name: 'javassist', version: '3.18.1-GA'

Expand Down
16 changes: 9 additions & 7 deletions web/icure-ht/app/src/elements/ht-msg/ht-msg-detail.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -414,10 +414,10 @@
if(this.selectMessage.selection.item){
this.selectMessage.selection.item.body = [];
this.api.document().findByMessage(this.user.healthcarePartyId, this.selectMessage.selection.item).then(docs => {
docs.map(doc => this.api.document().getAttachment(doc.id,doc.attachmentId, doc.secretForeignKeys).then(a=> {this.selectMessage.selection.item.body.push(a)}))
docs.map(doc => this.api.document().getAttachment(doc.id,doc.attachmentId, doc.secretForeignKeys).then(a=> this.selectMessage.selection.item.body.push(a)))
this.set('messages', [this.selectMessage.selection.item]);
this.getChildren(this.selectMessage.selection.item.id)
})
this.set('messages', [this.selectMessage.selection.item]);
this.getChildren(this.selectMessage.selection.item.id)
}
}

Expand All @@ -426,10 +426,12 @@
if(r.length){
r.body = [];
this.api.document().findByMessage(this.user.healthcarePartyId, r).then(docs => {
docs.map(doc => this.api.document().getAttachment(doc.id,doc.attachmentId, doc.secretForeignKeys).then(a => {r.body.push(a)}))
r.map(m => this.messages.push(m));
this.set('messages',this.messages)
r.map(m => this.getChildren(m));
docs.map(doc => this.api.document().getAttachment(doc.id,doc.attachmentId, doc.secretForeignKeys).then(a => {
r.body.push(a);
r.map(m => this.messages.push(m));
this.set('messages',this.messages)
r.map(m => this.getChildren(m));
}))
})
}
}.bind(this))
Expand Down
2 changes: 1 addition & 1 deletion web/icure-ht/app/src/elements/icc-api/api/ICCAccesslogApi.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ export class iccAccesslogApi {
const _url = this.host+"/accesslog/{accessLogIds}".replace("{accessLogIds}", accessLogIds+"") + "?ts=" + (new Date).getTime()

return XHR.sendCommand('DELETE', _url , this.headers, _body )
.then(doc => {if(doc.contentType.startsWith("application/octet-stream")){doc.body}else{true}})
.then(doc => doc.contentType.startsWith("application/octet-stream")?doc.body : true)
.catch(err => this.handleError(err))


Expand Down
2 changes: 1 addition & 1 deletion web/icure-ht/app/src/elements/icc-api/api/ICCBeehboxApi.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export class iccBeehboxApi {
const _url = this.host+"/be_ehbox/delete/{token}/{from}".replace("{token}", token+"").replace("{from}", from+"") + "?ts=" + (new Date).getTime()

return XHR.sendCommand('PUT', _url , this.headers, _body )
.then(doc => {if(doc.contentType.startsWith("application/octet-stream")){doc.body}else{true}})
.then(doc => doc.contentType.startsWith("application/octet-stream")?doc.body : true)
.catch(err => this.handleError(err))


Expand Down
8 changes: 4 additions & 4 deletions web/icure-ht/app/src/elements/icc-api/api/ICCBekmehrApi.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export class iccBekmehrApi {
const _url = this.host+"/be_kmehr/smf/{patientId}/export".replace("{patientId}", patientId+"") + "?ts=" + (new Date).getTime() + (language ? "&language=" + language : "")

return XHR.sendCommand('POST', _url , this.headers, _body )
.then(doc => {if(doc.contentType.startsWith("application/octet-stream")){doc.body}else{true}})
.then(doc => doc.contentType.startsWith("application/octet-stream")?doc.body : true)
.catch(err => this.handleError(err))


Expand All @@ -63,7 +63,7 @@ export class iccBekmehrApi {
const _url = this.host+"/be_kmehr/sumehr/{patientId}/export".replace("{patientId}", patientId+"") + "?ts=" + (new Date).getTime() + (language ? "&language=" + language : "")

return XHR.sendCommand('POST', _url , this.headers, _body )
.then(doc => {if(doc.contentType.startsWith("application/octet-stream")){doc.body}else{true}})
.then(doc => doc.contentType.startsWith("application/octet-stream")?doc.body : true)
.catch(err => this.handleError(err))


Expand All @@ -75,7 +75,7 @@ export class iccBekmehrApi {
const _url = this.host+"/be_kmehr/sumehrpp/{patientId}/export".replace("{patientId}", patientId+"") + "?ts=" + (new Date).getTime() + (language ? "&language=" + language : "")

return XHR.sendCommand('POST', _url , this.headers, _body )
.then(doc => {if(doc.contentType.startsWith("application/octet-stream")){doc.body}else{true}})
.then(doc => doc.contentType.startsWith("application/octet-stream")?doc.body : true)
.catch(err => this.handleError(err))


Expand Down Expand Up @@ -135,7 +135,7 @@ export class iccBekmehrApi {
const _url = this.host+"/be_kmehr/sumehr/{patientId}/validate".replace("{patientId}", patientId+"") + "?ts=" + (new Date).getTime() + (language ? "&language=" + language : "")

return XHR.sendCommand('POST', _url , this.headers, _body )
.then(doc => {if(doc.contentType.startsWith("application/octet-stream")){doc.body}else{true}})
.then(doc => doc.contentType.startsWith("application/octet-stream")?doc.body : true)
.catch(err => this.handleError(err))


Expand Down
8 changes: 4 additions & 4 deletions web/icure-ht/app/src/elements/icc-api/api/ICCBemikronoApi.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ export class iccBemikronoApi {
const _url = this.host+"/be_mikrono/notify/{appointmentId}/{action}".replace("{appointmentId}", appointmentId+"").replace("{action}", action+"") + "?ts=" + (new Date).getTime()

return XHR.sendCommand('GET', _url , this.headers, _body )
.then(doc => {if(doc.contentType.startsWith("application/octet-stream")){doc.body}else{true}})
.then(doc => doc.contentType.startsWith("application/octet-stream")?doc.body : true)
.catch(err => this.handleError(err))


Expand All @@ -87,7 +87,7 @@ export class iccBemikronoApi {
const _url = this.host+"/be_mikrono/user/{userId}/register".replace("{userId}", userId+"") + "?ts=" + (new Date).getTime()

return XHR.sendCommand('PUT', _url , this.headers, _body )
.then(doc => {if(doc.contentType.startsWith("application/octet-stream")){doc.body}else{true}})
.then(doc => doc.contentType.startsWith("application/octet-stream")?doc.body : true)
.catch(err => this.handleError(err))


Expand All @@ -99,7 +99,7 @@ export class iccBemikronoApi {
const _url = this.host+"/be_mikrono/sendMessage" + "?ts=" + (new Date).getTime()

return XHR.sendCommand('POST', _url , this.headers, _body )
.then(doc => {if(doc.contentType.startsWith("application/octet-stream")){doc.body}else{true}})
.then(doc => doc.contentType.startsWith("application/octet-stream")?doc.body : true)
.catch(err => this.handleError(err))


Expand All @@ -111,7 +111,7 @@ export class iccBemikronoApi {
const _url = this.host+"/be_mikrono/user/{userId}/credentials".replace("{userId}", userId+"") + "?ts=" + (new Date).getTime()

return XHR.sendCommand('PUT', _url , this.headers, _body )
.then(doc => {if(doc.contentType.startsWith("application/octet-stream")){doc.body}else{true}})
.then(doc => doc.contentType.startsWith("application/octet-stream")?doc.body : true)
.catch(err => this.handleError(err))


Expand Down
2 changes: 1 addition & 1 deletion web/icure-ht/app/src/elements/icc-api/api/ICCBeprimotoApi.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export class iccBeprimotoApi {
const _url = this.host+"/be_primoto/{nihii}".replace("{nihii}", nihii+"") + "?ts=" + (new Date).getTime() + (version ? "&version=" + version : "") + (serial ? "&serial=" + serial : "") + (doctor ? "&doctor=" + doctor : "") + (year ? "&year=" + year : "") + (from ? "&from=" + from : "") + (to ? "&to=" + to : "")

return XHR.sendCommand('GET', _url , this.headers, _body )
.then(doc => {if(doc.contentType.startsWith("application/octet-stream")){doc.body}else{true}})
.then(doc => doc.contentType.startsWith("application/octet-stream")?doc.body : true)
.catch(err => this.handleError(err))


Expand Down
4 changes: 2 additions & 2 deletions web/icure-ht/app/src/elements/icc-api/api/ICCBeresultexportApi.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export class iccBeresultexportApi {
const _url = this.host+"/be_result_export/hl1/{fromHcpId}/{toHcpId}/{patId}/{date}/{ref}".replace("{fromHcpId}", fromHcpId+"").replace("{toHcpId}", toHcpId+"").replace("{patId}", patId+"").replace("{date}", date+"").replace("{ref}", ref+"") + "?ts=" + (new Date).getTime() + (mustCrypt ? "&mustCrypt=" + mustCrypt : "")

return XHR.sendCommand('POST', _url , this.headers, _body )
.then(doc => {if(doc.contentType.startsWith("application/octet-stream")){doc.body}else{true}})
.then(doc => doc.contentType.startsWith("application/octet-stream")?doc.body : true)
.catch(err => this.handleError(err))


Expand All @@ -63,7 +63,7 @@ export class iccBeresultexportApi {
const _url = this.host+"/be_result_export/medidoc/{fromHcpId}/{toHcpId}/{patId}/{date}/{ref}".replace("{fromHcpId}", fromHcpId+"").replace("{toHcpId}", toHcpId+"").replace("{patId}", patId+"").replace("{date}", date+"").replace("{ref}", ref+"") + "?ts=" + (new Date).getTime() + (mustCrypt ? "&mustCrypt=" + mustCrypt : "")

return XHR.sendCommand('POST', _url , this.headers, _body )
.then(doc => {if(doc.contentType.startsWith("application/octet-stream")){doc.body}else{true}})
.then(doc => doc.contentType.startsWith("application/octet-stream")?doc.body : true)
.catch(err => this.handleError(err))


Expand Down
2 changes: 1 addition & 1 deletion web/icure-ht/app/src/elements/icc-api/api/ICCDoctemplateApi.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ export class iccDoctemplateApi {
const _url = this.host+"/doctemplate/{documentTemplateId}/attachment/{attachmentId}".replace("{documentTemplateId}", documentTemplateId+"").replace("{attachmentId}", attachmentId+"") + "?ts=" + (new Date).getTime()

return XHR.sendCommand('GET', _url , this.headers, _body )
.then(doc => {if(doc.contentType.startsWith("application/octet-stream")){doc.body}else{true}})
.then(doc => doc.contentType.startsWith("application/octet-stream")?doc.body : true)
.catch(err => this.handleError(err))


Expand Down
2 changes: 1 addition & 1 deletion web/icure-ht/app/src/elements/icc-api/api/ICCDocumentApi.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ export class iccDocumentApi {
const _url = this.host+"/document/{documentId}/attachment/{attachmentId}".replace("{documentId}", documentId+"").replace("{attachmentId}", attachmentId+"") + "?ts=" + (new Date).getTime() + (sfks ? "&sfks=" + sfks : "")

return XHR.sendCommand('GET', _url , this.headers, _body )
.then(doc => {if(doc.contentType.startsWith("application/octet-stream")){doc.body}else{true}})
.then(doc => doc.contentType.startsWith("application/octet-stream")?doc.body : true)
.catch(err => this.handleError(err))


Expand Down
2 changes: 1 addition & 1 deletion web/icure-ht/app/src/elements/icc-api/api/ICCGenericApi.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export class iccGenericApi {
const _url = this.host+"/generic/doc/{className}/{ids}".replace("{className}", className+"").replace("{ids}", ids+"") + "?ts=" + (new Date).getTime()

return XHR.sendCommand('DELETE', _url , this.headers, _body )
.then(doc => {if(doc.contentType.startsWith("application/octet-stream")){doc.body}else{true}})
.then(doc => doc.contentType.startsWith("application/octet-stream")?doc.body : true)
.catch(err => this.handleError(err))


Expand Down
12 changes: 6 additions & 6 deletions web/icure-ht/app/src/elements/icc-api/api/ICCIcureApi.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ export class iccIcureApi {
const _url = this.host+"/icure/conflicts/contact" + "?ts=" + (new Date).getTime()

return XHR.sendCommand('POST', _url , this.headers, _body )
.then(doc => {if(doc.contentType.startsWith("application/octet-stream")){doc.body}else{true}})
.then(doc => doc.contentType.startsWith("application/octet-stream")?doc.body : true)
.catch(err => this.handleError(err))


Expand All @@ -159,7 +159,7 @@ export class iccIcureApi {
const _url = this.host+"/icure/conflicts/form" + "?ts=" + (new Date).getTime()

return XHR.sendCommand('POST', _url , this.headers, _body )
.then(doc => {if(doc.contentType.startsWith("application/octet-stream")){doc.body}else{true}})
.then(doc => doc.contentType.startsWith("application/octet-stream")?doc.body : true)
.catch(err => this.handleError(err))


Expand All @@ -171,7 +171,7 @@ export class iccIcureApi {
const _url = this.host+"/icure/conflicts/healthelement" + "?ts=" + (new Date).getTime()

return XHR.sendCommand('POST', _url , this.headers, _body )
.then(doc => {if(doc.contentType.startsWith("application/octet-stream")){doc.body}else{true}})
.then(doc => doc.contentType.startsWith("application/octet-stream")?doc.body : true)
.catch(err => this.handleError(err))


Expand All @@ -183,7 +183,7 @@ export class iccIcureApi {
const _url = this.host+"/icure/conflicts/invoice" + "?ts=" + (new Date).getTime()

return XHR.sendCommand('POST', _url , this.headers, _body )
.then(doc => {if(doc.contentType.startsWith("application/octet-stream")){doc.body}else{true}})
.then(doc => doc.contentType.startsWith("application/octet-stream")?doc.body : true)
.catch(err => this.handleError(err))


Expand All @@ -195,7 +195,7 @@ export class iccIcureApi {
const _url = this.host+"/icure/conflicts/message" + "?ts=" + (new Date).getTime()

return XHR.sendCommand('POST', _url , this.headers, _body )
.then(doc => {if(doc.contentType.startsWith("application/octet-stream")){doc.body}else{true}})
.then(doc => doc.contentType.startsWith("application/octet-stream")?doc.body : true)
.catch(err => this.handleError(err))


Expand All @@ -207,7 +207,7 @@ export class iccIcureApi {
const _url = this.host+"/icure/conflicts/patient" + "?ts=" + (new Date).getTime()

return XHR.sendCommand('POST', _url , this.headers, _body )
.then(doc => {if(doc.contentType.startsWith("application/octet-stream")){doc.body}else{true}})
.then(doc => doc.contentType.startsWith("application/octet-stream")?doc.body : true)
.catch(err => this.handleError(err))


Expand Down
2 changes: 1 addition & 1 deletion web/icure-ht/app/src/elements/icc-api/api/ICCInsuranceApi.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ export class iccInsuranceApi {
const _url = this.host+"/insurance/{insuranceId}".replace("{insuranceId}", insuranceId+"") + "?ts=" + (new Date).getTime()

return XHR.sendCommand('DELETE', _url , this.headers, _body )
.then(doc => {if(doc.contentType.startsWith("application/octet-stream")){doc.body}else{true}})
.then(doc => doc.contentType.startsWith("application/octet-stream")?doc.body : true)
.catch(err => this.handleError(err))


Expand Down
2 changes: 1 addition & 1 deletion web/icure-ht/app/src/elements/icc-api/api/ICCInvoiceApi.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ export class iccInvoiceApi {
const _url = this.host+"/invoice/{invoiceId}".replace("{invoiceId}", invoiceId+"") + "?ts=" + (new Date).getTime()

return XHR.sendCommand('DELETE', _url , this.headers, _body )
.then(doc => {if(doc.contentType.startsWith("application/octet-stream")){doc.body}else{true}})
.then(doc => doc.contentType.startsWith("application/octet-stream")?doc.body : true)
.catch(err => this.handleError(err))


Expand Down
4 changes: 2 additions & 2 deletions web/icure-ht/app/src/elements/icc-api/api/ICCMessageApi.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ export class iccMessageApi {
const _url = this.host+"/message/{messageIds}".replace("{messageIds}", messageIds+"") + "?ts=" + (new Date).getTime()

return XHR.sendCommand('DELETE', _url , this.headers, _body )
.then(doc => {if(doc.contentType.startsWith("application/octet-stream")){doc.body}else{true}})
.then(doc => doc.contentType.startsWith("application/octet-stream")?doc.body : true)
.catch(err => this.handleError(err))


Expand All @@ -87,7 +87,7 @@ export class iccMessageApi {
const _url = this.host+"/message/delete/byIds" + "?ts=" + (new Date).getTime()

return XHR.sendCommand('POST', _url , this.headers, _body )
.then(doc => {if(doc.contentType.startsWith("application/octet-stream")){doc.body}else{true}})
.then(doc => doc.contentType.startsWith("application/octet-stream")?doc.body : true)
.catch(err => this.handleError(err))


Expand Down
2 changes: 1 addition & 1 deletion web/icure-ht/app/src/elements/icc-api/api/ICCPatientApi.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ export class iccPatientApi {
const _url = this.host+"/patient/forceLog" + "?ts=" + (new Date).getTime()

return XHR.sendCommand('POST', _url , this.headers, _body )
.then(doc => {if(doc.contentType.startsWith("application/octet-stream")){doc.body}else{true}})
.then(doc => doc.contentType.startsWith("application/octet-stream")?doc.body : true)
.catch(err => this.handleError(err))


Expand Down
2 changes: 1 addition & 1 deletion web/icure-ht/app/src/elements/icc-api/api/ICCReplicationApi.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ export class iccReplicationApi {
const _url = this.host+"/replication/{replicationId}".replace("{replicationId}", replicationId+"") + "?ts=" + (new Date).getTime()

return XHR.sendCommand('DELETE', _url , this.headers, _body )
.then(doc => {if(doc.contentType.startsWith("application/octet-stream")){doc.body}else{true}})
.then(doc => doc.contentType.startsWith("application/octet-stream")?doc.body : true)
.catch(err => this.handleError(err))


Expand Down
Loading

0 comments on commit 5c93083

Please sign in to comment.