From efd4bb52bbbe895ed6c18c650db9c4b87a469ef7 Mon Sep 17 00:00:00 2001 From: Antoine Duchateau Date: Tue, 5 Jun 2018 09:49:40 +0200 Subject: [PATCH 01/14] More general purpose methods on UserDAO + removed obsolete migration --- .../java/org/taktik/icure/dao/UserDAO.java | 6 ++ .../taktik/icure/dao/impl/UserDAOImpl.java | 15 ++++ .../migration/InsurancesParentsMigration.java | 77 ------------------- 3 files changed, 21 insertions(+), 77 deletions(-) delete mode 100644 src/main/java/org/taktik/icure/dao/migration/InsurancesParentsMigration.java diff --git a/src/main/java/org/taktik/icure/dao/UserDAO.java b/src/main/java/org/taktik/icure/dao/UserDAO.java index e8c21e457d..739c4cc87f 100644 --- a/src/main/java/org/taktik/icure/dao/UserDAO.java +++ b/src/main/java/org/taktik/icure/dao/UserDAO.java @@ -37,9 +37,15 @@ public interface UserDAO extends GenericDAO { User getOnFallback(String userId); + User findOnFallback(String userId); + User getUserOnUserDb(String userId, String groupId); + User findUserOnUserDb(String userId, String groupId); + List getUsersOnDb(String groupId); void evictFromCache(String groupId, List userIds); + + User saveOnFallback(User user); } \ No newline at end of file diff --git a/src/main/java/org/taktik/icure/dao/impl/UserDAOImpl.java b/src/main/java/org/taktik/icure/dao/impl/UserDAOImpl.java index 3780bcbf18..b9d3e504b7 100644 --- a/src/main/java/org/taktik/icure/dao/impl/UserDAOImpl.java +++ b/src/main/java/org/taktik/icure/dao/impl/UserDAOImpl.java @@ -95,11 +95,21 @@ public User getOnFallback(String userId) { return ((CouchDbICureConnector) db).getFallbackConnector().get(User.class,userId); } + @Override + public User findOnFallback(String userId) { + return ((CouchDbICureConnector) db).getFallbackConnector().find(User.class,userId); + } + @Override public User getUserOnUserDb(String userId, String groupId) { return ((CouchDbICureConnector) db).getCouchDbICureConnector(groupId).get(User.class,userId); } + @Override + public User findUserOnUserDb(String userId, String groupId) { + return ((CouchDbICureConnector) db).getCouchDbICureConnector(groupId).find(User.class,userId); + } + @Override public List getUsersOnDb(String groupId) { return ((CouchDbICureConnector) db).getCouchDbICureConnector(groupId).queryView(createQuery("all").includeDocs(true), User.class); @@ -116,6 +126,11 @@ public void evictFromCache(String groupId, List userIds) { super.evictFromCache(groupId,ALL_ENTITIES_CACHE_KEY); } + @Override + public User saveOnFallback(User user) { + ((CouchDbICureConnector) db).getFallbackConnector().update(user); + return user; + } @Override protected User save(Boolean newEntity, User entity) { diff --git a/src/main/java/org/taktik/icure/dao/migration/InsurancesParentsMigration.java b/src/main/java/org/taktik/icure/dao/migration/InsurancesParentsMigration.java deleted file mode 100644 index 95afef2000..0000000000 --- a/src/main/java/org/taktik/icure/dao/migration/InsurancesParentsMigration.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright (C) 2018 Taktik SA - * - * This file is part of iCureBackend. - * - * iCureBackend is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as published by - * the Free Software Foundation. - * - * iCureBackend is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with iCureBackend. If not, see . - */ - -package org.taktik.icure.dao.migration; - - -import org.ektorp.DocumentNotFoundException; -import org.ektorp.support.CouchDbRepositorySupport; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; -import org.taktik.icure.dao.FormDAO; -import org.taktik.icure.dao.InsuranceDAO; -import org.taktik.icure.dao.impl.ektorp.CouchDbICureConnector; -import org.taktik.icure.db.PaginatedList; -import org.taktik.icure.db.PaginationOffset; -import org.taktik.icure.entities.Form; -import org.taktik.icure.entities.Insurance; -import org.taktik.icure.entities.base.StoredDocument; - -import java.util.Arrays; -import java.util.LinkedList; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -@Repository("insurancesParentsMigration") -public class InsurancesParentsMigration extends CouchDbRepositorySupport implements DbMigration { - - InsuranceDAO insuranceDAO; - - @Autowired - protected InsurancesParentsMigration(@SuppressWarnings("SpringJavaAutowiringInspection") @Qualifier("couchdbBase") CouchDbICureConnector couchdb) { - super(MigrationStub.class, couchdb, false); - } - - @Override - public boolean hasBeenApplied() { - try { - this.get(this.getClass().getCanonicalName()); - return true; - } catch (DocumentNotFoundException ignored) {} - return false; - } - - @Override - public void apply() { - List parents = Stream.of("100", "200", "300", "400", "500", "600", "900").map(c -> insuranceDAO.listByCode(c).iterator().next()).filter(Objects::nonNull).collect(Collectors.toList()); - - List all = insuranceDAO.getAll(); - all.forEach(i->i.setParent(i.getCode().equals("306")?i.getId():parents.stream().filter(p->p.getCode().startsWith(i.getCode().substring(0,1))).findAny().map(Insurance::getId).orElse(null))); - insuranceDAO.save(all); - - this.update(new MigrationStub(this.getClass().getCanonicalName())); - } - - @Autowired - public void setInsuranceDAO(InsuranceDAO insuranceDAO) { - this.insuranceDAO = insuranceDAO; - } -} From e3bb9ff394c0c4bd503a174ece32182ddada186d Mon Sep 17 00:00:00 2001 From: Maxime Mennechet Date: Tue, 5 Jun 2018 11:35:23 +0200 Subject: [PATCH 02/14] Add filter into patient search --- .../ht-pat-detail-ctc-detail-panel.html | 9 +- .../app/src/elements/ht-pat/ht-pat-list.html | 330 ++++++++++++++---- .../app/src/elements/language/language.json | 3 + 3 files changed, 278 insertions(+), 64 deletions(-) diff --git a/web/icure-ht/app/src/elements/ht-pat/ht-pat-detail-ctc-detail-panel.html b/web/icure-ht/app/src/elements/ht-pat/ht-pat-detail-ctc-detail-panel.html index 66105fbc4d..fce5ed5768 100644 --- a/web/icure-ht/app/src/elements/ht-pat/ht-pat-detail-ctc-detail-panel.html +++ b/web/icure-ht/app/src/elements/ht-pat/ht-pat-detail-ctc-detail-panel.html @@ -648,7 +648,7 @@

[[localize('pri_pre','Print prescription',language)]] this.api.form().getFormTemplatesByGuid(templateGuid, (hcp.specialityCodes[0] && hcp.specialityCodes[0].code || 'deptgeneralpractice').replace(/persphysician/, 'deptgeneralpractice'))).then(formTemplates => { + this.api.hcparty().getCurrentHealthcareParty().then(hcp => this.api.form().getFormTemplatesByGuid(templateGuid, ((hcp.specialityCodes||[])[0] && hcp.specialityCodes[0].code || 'deptgeneralpractice').replace(/persphysician/, 'deptgeneralpractice'))).then(formTemplates => { console.log("FTs: " + formTemplates.size + " FTs loaded"); if (formTemplates[0] && formTemplates[0].id) { //Create a new form and link it to the currentContact @@ -1058,7 +1058,12 @@

[[localize('pri_pre','Print prescription',language)]] { + return Promise.all([ + this.api.form().findFormTemplates(), + this.api.form().findFormTemplatesBySpeciality(((this.api.hcParties[this.user.healthcarePartyId]||{}).specialityCodes||[])[0] || 'deptgeneralpractice') + ]) + .then(res=>_.uniqBy(_.flatMap(res),'id')) + .then(fts => { const filtered = fts.filter(ft => !regExp || ft.name && ft.name.match(regExp) || ft.group && ft.group.name && ft.group.name.match(regExp) || ft.guid && ft.guid.match(regExp)); return { totalSize: fts.length, rows: (descending ? _.reverse(_.sortBy(filtered, sortKey)) : _.sortBy(filtered, sortKey)).slice(offset, limit) }; }); diff --git a/web/icure-ht/app/src/elements/ht-pat/ht-pat-list.html b/web/icure-ht/app/src/elements/ht-pat/ht-pat-list.html index ea1f99d2d6..1b147eae3c 100644 --- a/web/icure-ht/app/src/elements/ht-pat/ht-pat-list.html +++ b/web/icure-ht/app/src/elements/ht-pat/ht-pat-list.html @@ -145,7 +145,6 @@ } .add-btn-container{ - position: fixed; width: 100%; display: flex; flex-direction: row; @@ -153,6 +152,7 @@ align-items: center; bottom: 16px; left: 0; + margin-top: 2px; } .add-btn{ @@ -167,6 +167,29 @@ padding: 10px 1.2em; } + .save-btn-container{ + width: 100%; + display: flex; + flex-direction: row; + justify-content: center; + align-items: center; + bottom: 16px; + left: 0; + margin-top: 2px; + } + + .save-btn{ + --paper-button-ink-color: var(--app-secondary-color-dark); + background:var(--app-secondary-color); + color:var(--app-text-color); + font-weight:bold; + font-size:14px; + height:40px; + min-width:100px; + @apply --shadow-elevation-2dp; + padding: 10px 1.2em; + } + .patient-photo { background: rgba(0, 0, 0, 0.1); height: 26px; @@ -183,70 +206,185 @@ margin: 50%; transform: translate(-50%, -50%); } + + + .container { + width: 100%; + height: calc(100vh - 64px); + display:grid; + grid-template-columns: 20% 30% 50%; + grid-template-rows: 100%; + position: fixed; + top: 64px; + left: 0; + bottom: 0; + right: 0; + } + + .first-filter-panel{ + /*width:20%; + height:calc(100% - 64px);*/ + height:100%; + background: var(--app-background-color-dark); + /*position:fixed;*/ + top:64px; + left:0; + @apply --shadow-elevation-3dp; + grid-column: 1 / 1; + grid-row:1 / 1; + z-index:3; + overflow:hidden; + padding: 5px; + } + + + .second-filter-panel{ + /*width:30%;*/ + height:100%; + background: var(--app-background-color); + /*position:fixed;*/ + top:64px; + left:20%; + @apply --shadow-elevation-2dp; + margin:0; + grid-column: 2 / 4; + grid-row:1 / 1; + + z-index:2; + padding: 5px; + + + } + + .display-left-menu{ + display:inherit; + } + + .submenus-container{ + overflow-x: auto; + height: calc(100% - 140px); + margin-bottom:16px; + } + + collapse-button > .menu-item.iron-selected { + @apply --padding-right-left-16; + color:var(--app-text-color-light); + background:var(--app-primary-color); + @apply --text-shadow; + } + + .menu-item{ + @apply --padding-right-left-16; + height:48px; + @apply --paper-font-button; + text-transform: inherit; + justify-content: space-between; + cursor: pointer; + @apply --transition; + } + + .menu-item:hover{ + background: var(--app-dark-color-faded); + @apply --transition; + } + + .menu-item .iron-selected{ + background:var(--app-primary-color); + + } + + .filterNameInput{ + width: 400px; + } + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
[[localize('add_pat','Add Patient',language)]]
+ +
+
+

Filtres sauvegardés

+
+ + + + + +
+
[[localize('save_filter','Save Filter',language)]]
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
[[localize('add_pat','Add Patient',language)]]
+
+
+
@@ -258,6 +396,18 @@ [[localize('cre','Create',language)]]
+ + +

[[localize('save_filter','Save Filter',language)]]

+
+ +
+
+ [[localize('can','Cancel',language)]] + [[localize('cre','Create',language)]] +
+ + + + + + + +
+
+ + + +
+
+ + + diff --git a/web/icure-ht/app/src/app-theme.tz.html b/web/icure-ht/app/src/app-theme.tz.html new file mode 100644 index 0000000000..73d7f0f513 --- /dev/null +++ b/web/icure-ht/app/src/app-theme.tz.html @@ -0,0 +1,48 @@ + + + + + + + diff --git a/web/icure-ht/app/src/elements/splash-screen/splash-screen-tz.html b/web/icure-ht/app/src/elements/splash-screen/splash-screen-tz.html new file mode 100644 index 0000000000..975296ecd4 --- /dev/null +++ b/web/icure-ht/app/src/elements/splash-screen/splash-screen-tz.html @@ -0,0 +1,108 @@ + + + + + + diff --git a/web/icure-ht/app/src/ht-app-tz.html b/web/icure-ht/app/src/ht-app-tz.html new file mode 100644 index 0000000000..b5db59e40b --- /dev/null +++ b/web/icure-ht/app/src/ht-app-tz.html @@ -0,0 +1,1214 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/web/icure-ht/webpack.config.tz.js b/web/icure-ht/webpack.config.tz.js new file mode 100644 index 0000000000..c1f9983853 --- /dev/null +++ b/web/icure-ht/webpack.config.tz.js @@ -0,0 +1,105 @@ +/* webpack.config.js */ + +var HtmlWebpackPlugin = require('html-webpack-plugin'); +var CopyWebpackPlugin = require('copy-webpack-plugin'); +// var HtmlIncluderWebpackPlugin = require('html-includer-webpack-plugin').default; +var Clean = require('clean-webpack-plugin'); +var path = require('path'); +console.log(path.resolve(__dirname)) +module.exports = { + // Tell Webpack which file kicks off our app. + entry: path.resolve(__dirname, 'app/src/ht-app-tz.html'), + // Tell Weback to output our bundle to ./dist/bundle.js + output: { + filename: '[name].bundle.js', + path: path.resolve(__dirname, 'dist-tz') + }, + // Tell Webpack which directories to look in to resolve import statements. + // Normally Webpack will look in node_modules by default but since we’re overriding + // the property we’ll need to tell it to look there in addition to the + // bower_components folder. + resolve: { + modules: [ + path.resolve(__dirname, 'app/bower_components'), + path.resolve(__dirname, 'node_modules'), + ], + extensions: ['.ts', '.tsx', '.js', '.jsx', '.html'] + }, + devtool: 'inline-source-map', + node: { + fs: 'empty' + }, + module: { + rules: [ + { + test: /\.html$/, + use: [ + { + loader: 'babel-loader', + + options: { + /*presets: ['es2015'],*/ + plugins: ['babel-plugin-lodash','syntax-dynamic-import'] + } + }, + { + loader: 'polymer-webpack-loader' + } + ] + }, + { + // If you see a file that ends in .js, just send it to the babel-loader. + test: /\.js$/, + use: [{ loader: 'babel-loader', options: { /*presets: ['es2015']*/ }}], + exclude: /(node_modules|bower_components)/ + }, + { + test: /\.ts$/, + use: 'ts-loader', + }, + { + test: /\.(gif|png|jpe?g|svg)$/i, + use: [ + 'file-loader', + { + loader: 'image-webpack-loader', + options: { + bypassOnDebug: true, + }, + }, + ], + }, + ] + }, + mode: 'development', + plugins: [ + // This plugin will generate an index.html file for us that can be used + // by the Webpack dev server. We can give it a template file (written in EJS) + // and it will handle injecting our bundle for us. + new HtmlWebpackPlugin({ + inject: false, + debug: true, + template: path.resolve(__dirname, 'app/index.tz.ejs') + }), + // This plugin will copy files over to ‘./dist’ without transforming them. + // That's important because the custom-elements-es5-adapter.js MUST + // remain in ES2015. We’ll talk about this a bit later :) + new CopyWebpackPlugin([{ + from: path.resolve(__dirname, 'app/bower_components/webcomponentsjs/*.js'), + to: 'bower_components/webcomponentsjs/[name].[ext]' + }]), + new Clean(['build']), + ], + devServer: { + contentBase: path.join(__dirname,'dist'), + compress: true, + overlay: true, + port: 9000, + proxy: { + '/rest/v1': { + target: /*'https://service.icure.cloud'*/'http://127.0.0.1:16043', + changeOrigin: true + } + } + }, +}; From 7e1fc84cc8b83c2ee7933f9da30ade9d6ccb06ea Mon Sep 17 00:00:00 2001 From: Antoine Duchateau Date: Wed, 6 Jun 2018 10:06:18 +0200 Subject: [PATCH 05/14] Fixed rights for tz/ --- src/main/kotlin/org/taktik/icure/config/SecurityConfig.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/kotlin/org/taktik/icure/config/SecurityConfig.kt b/src/main/kotlin/org/taktik/icure/config/SecurityConfig.kt index c246e26aa9..c0827b6e18 100644 --- a/src/main/kotlin/org/taktik/icure/config/SecurityConfig.kt +++ b/src/main/kotlin/org/taktik/icure/config/SecurityConfig.kt @@ -116,6 +116,7 @@ class SecurityConfigAdapter(private val daoAuthenticationProvider: CustomAuthent .antMatchers("/admin/**").hasRole("USER") .antMatchers("/ht/**").permitAll() + .antMatchers("/tz/**").permitAll() .antMatchers("/ping.json").permitAll() From 8fa0d1f72437ca21b4c87e83a89a8225ff776784 Mon Sep 17 00:00:00 2001 From: Antoine Duchateau Date: Wed, 6 Jun 2018 10:20:22 +0200 Subject: [PATCH 06/14] Improve rights --- build.gradle | 2 +- src/main/kotlin/org/taktik/icure/config/SecurityConfig.kt | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index d7e826fcd7..d8513f9fef 100644 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ configure(allprojects) { group = 'org.taktik.icure' -version = '1.0.6' +version = '1.0.7' sourceCompatibility = 1.8 compileKotlin { kotlinOptions { diff --git a/src/main/kotlin/org/taktik/icure/config/SecurityConfig.kt b/src/main/kotlin/org/taktik/icure/config/SecurityConfig.kt index c0827b6e18..df266d3d4b 100644 --- a/src/main/kotlin/org/taktik/icure/config/SecurityConfig.kt +++ b/src/main/kotlin/org/taktik/icure/config/SecurityConfig.kt @@ -109,12 +109,8 @@ class SecurityConfigAdapter(private val daoAuthenticationProvider: CustomAuthent .antMatchers("/api/css/**").permitAll() .antMatchers("/api/**").hasRole("USER") - .antMatchers("/admin/bower_components/**").permitAll() - .antMatchers("/admin/images/**").permitAll() - .antMatchers("/admin/styles/**").permitAll() - .antMatchers("/admin/logon.html").permitAll() - .antMatchers("/admin/**").hasRole("USER") - + .antMatchers("/ht").permitAll() + .antMatchers("/tz").permitAll() .antMatchers("/ht/**").permitAll() .antMatchers("/tz/**").permitAll() From c4c6ccc9128545bc122e5de1ffbec236d2eeb969 Mon Sep 17 00:00:00 2001 From: Maxime Mennechet Date: Wed, 6 Jun 2018 13:12:03 +0200 Subject: [PATCH 07/14] add filterExPrinter class --- .../src/elements/icc-x-api/filterExPrinter.ts | 96 +++++++++++++++++++ 1 file changed, 96 insertions(+) create mode 100644 web/icure-ht/app/src/elements/icc-x-api/filterExPrinter.ts diff --git a/web/icure-ht/app/src/elements/icc-x-api/filterExPrinter.ts b/web/icure-ht/app/src/elements/icc-x-api/filterExPrinter.ts new file mode 100644 index 0000000000..b4713d8b44 --- /dev/null +++ b/web/icure-ht/app/src/elements/icc-x-api/filterExPrinter.ts @@ -0,0 +1,96 @@ +export class FilterExPrinter { + private map(ex:any):Filter { + if ((ex as Filter).$type === 'IntersectionFilter') { + return new IntersectionFilter((ex as IntersectionFilter).filters.map(f=>this.map(f))) + } else if ((ex as Filter).$type === 'UnionFilter') { + return new UnionFilter((ex as UnionFilter).filters.map(f=>this.map(f))) + } else if ((ex as Filter).$type === 'ServiceByHcPartyTagCodeDateFilter') { + const f = ex as ServiceByHcPartyTagCodeDateFilter + return new ServiceByHcPartyTagCodeDateFilter(f.codeType,f.codeCode,f.tagType,f.tagCode) + } + throw 'Unmappable filter '+ex + } + + print(ex:JSON) { + return this.map(ex).print() + } +} + +class Filter { + $type:string + constructor($type: string) { + this.$type = $type; + } + + print() { + return '' + } +} + +class IntersectionFilter extends Filter { + filters: Array + + constructor(filters: Array) { + super('IntersectionFilter') + this.filters = filters + } + + add(f:Filter) {this.filters.push(f); return this;} + + print() { + return this.filters.map(f=>`(${f.print()})`).join(' & ') + } +} + +class UnionFilter extends Filter { + filters: Array + + constructor(filters: Array) { + super('UnionFilter') + this.filters = filters + } + + print() { + return this.filters.map(f=>`(${f.print()})`).join(' | ') + } +} + +class ComparisonFilter extends Filter { + leftPart:string + rightPart:string + comparator:string + + constructor(leftPart: string, rightPart: string, comparator: string) { + super('ComparisonFilter'); + this.leftPart = leftPart; + this.rightPart = rightPart; + this.comparator = comparator; + } + + print() { + return `"${this.leftPart}" ${this.comparator} "${this.rightPart}"` + } +} + +class ServiceByHcPartyTagCodeDateFilter extends Filter { + codeType: string + codeCode: string + tagType: string + tagCode: string + + constructor(codeType: string, codeCode: string, tagType: string, tagCode: string) { + super('ServiceByHcPartyTagCodeDateFilter') + this.codeType = codeType; + this.codeCode = codeCode; + this.tagType = tagType; + this.tagCode = tagCode; + } + + print() { + const out = new IntersectionFilter([]) + if (this.codeType) { out.add(new ComparisonFilter(this.codeType,this.codeCode,'=='))} + if (this.tagType) { out.add(new ComparisonFilter(':'+this.tagType,this.tagCode,'=='))} + return out.print() + } +} + From 4af1d88994f33f85e11db8bd027255a567399a01 Mon Sep 17 00:00:00 2001 From: Antoine Duchateau Date: Wed, 6 Jun 2018 13:15:22 +0200 Subject: [PATCH 08/14] Improved build process and fixed tz typo --- build.gradle | 11 ++++++++++- web/icure-ht/app/src/ht-app-tz.html | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index d8513f9fef..d2d9ae6395 100644 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ configure(allprojects) { group = 'org.taktik.icure' -version = '1.0.7' +version = '1.0.8' sourceCompatibility = 1.8 compileKotlin { kotlinOptions { @@ -41,6 +41,15 @@ compileKotlin { jvmTarget = "1.8" } } + + +compileJava { + options.fork = true + options.forkOptions.with { + memoryMaximumSize = "2048m" + } +} + compileTestKotlin { kotlinOptions { freeCompilerArgs = ["-Xjsr305=strict"] diff --git a/web/icure-ht/app/src/ht-app-tz.html b/web/icure-ht/app/src/ht-app-tz.html index b5db59e40b..be823f9535 100644 --- a/web/icure-ht/app/src/ht-app-tz.html +++ b/web/icure-ht/app/src/ht-app-tz.html @@ -1208,7 +1208,7 @@ } } - customElements.define(HtAppTz.is, HtApp); + customElements.define(HtAppTz.is, HtAppTz); From a97a86fbff4696e66fa3f2bbb66b3588b91677d7 Mon Sep 17 00:00:00 2001 From: Antoine Duchateau Date: Wed, 6 Jun 2018 14:21:35 +0200 Subject: [PATCH 09/14] Fix theme and app --- web/icure-ht/app/src/{app-theme.tz.html => app-theme-tz.html} | 0 web/icure-ht/app/src/ht-app-tz.html | 2 +- web/icure-ht/package-lock.json | 3 ++- 3 files changed, 3 insertions(+), 2 deletions(-) rename web/icure-ht/app/src/{app-theme.tz.html => app-theme-tz.html} (100%) diff --git a/web/icure-ht/app/src/app-theme.tz.html b/web/icure-ht/app/src/app-theme-tz.html similarity index 100% rename from web/icure-ht/app/src/app-theme.tz.html rename to web/icure-ht/app/src/app-theme-tz.html diff --git a/web/icure-ht/app/src/ht-app-tz.html b/web/icure-ht/app/src/ht-app-tz.html index be823f9535..8422abbbc0 100644 --- a/web/icure-ht/app/src/ht-app-tz.html +++ b/web/icure-ht/app/src/ht-app-tz.html @@ -10,7 +10,7 @@ - + diff --git a/web/icure-ht/package-lock.json b/web/icure-ht/package-lock.json index 574742f919..896e967a5d 100644 --- a/web/icure-ht/package-lock.json +++ b/web/icure-ht/package-lock.json @@ -4836,7 +4836,8 @@ "jsbn": { "version": "0.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "json-schema": { "version": "0.2.3", From c63efbfc8dae852999048147c4868f7f908eb2db Mon Sep 17 00:00:00 2001 From: Maxime Mennechet Date: Thu, 7 Jun 2018 14:43:00 +0200 Subject: [PATCH 10/14] fixed filter in patient search --- .../app/src/elements/ht-pat/ht-pat-list.html | 142 +++++++++++------- .../src/elements/ht-tools/ht-my-profile.html | 2 +- .../src/elements/icc-x-api/filterExPrinter.ts | 21 +-- web/icure-ht/app/src/ht-app.html | 8 +- 4 files changed, 109 insertions(+), 64 deletions(-) diff --git a/web/icure-ht/app/src/elements/ht-pat/ht-pat-list.html b/web/icure-ht/app/src/elements/ht-pat/ht-pat-list.html index 1b147eae3c..01eec6a893 100644 --- a/web/icure-ht/app/src/elements/ht-pat/ht-pat-list.html +++ b/web/icure-ht/app/src/elements/ht-pat/ht-pat-list.html @@ -290,32 +290,45 @@ .menu-item .iron-selected{ background:var(--app-primary-color); - } .filterNameInput{ width: 400px; } + .deleteFilterIcon{ + float: right; + color: #66dfa1; + } + + paper-item.iron-selected { + background-color: var(--app-primary-color); + color: var(--app-text-color-light); + } + + paper-item.iron-selected:hover { + background: #5a6d75; + } + -

Filtres sauvegardés

- - - +
[[localize('save_filter','Save Filter',language)]]
@@ -415,6 +428,7 @@

[[localize('save_filter','Save Filter',language)]]

import moment from 'moment/src/moment'; import _ from 'lodash/lodash'; import filterExParser from '../../../scripts/filterExParser'; +import {FilterExPrinter} from '../icc-x-api/filterExPrinter'; class HtPatList extends Polymer.TkLocalizerMixin(Polymer.mixinBehaviors([], Polymer.Element)) { static get is() { @@ -436,9 +450,6 @@

[[localize('save_filter','Save Filter',language)]]

activeItem: { type: Object }, - activeFilters:{ - type: Object - }, i18n: { Type: Object, value: function () { @@ -466,14 +477,22 @@

[[localize('save_filter','Save Filter',language)]]

}; return res; } - } + }, + selectedFilters: { + type: Array, + notify: true, + value: () => [] + } }; } + static get observers() { return ['_filterValueChanged(filterValue)']} + constructor() { super(); } + ready() { super.ready(); @@ -560,16 +579,6 @@

[[localize('save_filter','Save Filter',language)]]

}.bind(this)); }.bind(this); - - const filters = this.user.properties.find(p => p.type && p.type.identifier === 'org.taktik.icure.datafilters') - if (filters) { - const parsedFilters = JSON.parse(filters.typedValue.stringValue) - this.set('activeFilters', _.sortBy(Object.keys(parsedFilters).map(k=>({name:k, filter:parsedFilters[k]})))); - } else { - this.set('activeFilters', []) - } - - } formatDateOfBirth(dateOfBirth) { @@ -606,15 +615,6 @@

[[localize('save_filter','Save Filter',language)]]

const selected = this.activeItem; console.log('selected ' + selected + ' - ' + this.latestSelected); this.set('selectedPatient', selected); - /*if (this.inDoubleClick && ((this.latestSelected === selected) || (this.latestSelected && !selected) || (!this.latestSelected && selected))) { - this.set('selectedPatient', selected || this.latestSelected) - } else { - this.latestSelected = selected - this.inDoubleClick = true - setTimeout(() => { - delete this.inDoubleClick - }, 500) - }*/ } _addPatient() { @@ -622,14 +622,10 @@

[[localize('save_filter','Save Filter',language)]]

} confirm() { - this.api.patient().newInstance(this.user, { lastName: this.lastName, firstName: this.firstName, dateOfBirth: this.dateAsString && parseInt(this.dateAsString.replace(/-/g, '')) }).then(p => this.api.patient().createPatient(p)).then(p => this.set('selectedPatient', p)); + this.api.patient().newInstance(this.user, { lastName: this.lastName, firstName: this.firstName, active: true, dateOfBirth: this.dateAsString && parseInt(this.dateAsString.replace(/-/g, '')) }).then(p => this.api.patient().createPatient(p)).then(p => this.set('selectedPatient', p)); } confirmFilter(){ - - console.log(this.filterValue); - console.log(this.filterName); - const filtersProperty = this.user.properties.find(p => p.type && p.type.identifier === 'org.taktik.icure.datafilters') || (this.user.properties[this.user.properties.length] = {type:{identifier:'org.taktik.icure.datafilters'}, typedValue:{type:'STRING', stringValue:'{}'}}) @@ -637,12 +633,13 @@

[[localize('save_filter','Save Filter',language)]]

if (!filtersProperty.typedValue.stringValue) { filtersProperty.typedValue.type = 'STRING'; filtersProperty.typedValue.stringValue = '{}'} const filters = JSON.parse(filtersProperty.typedValue.stringValue) - filters[this.filterName] = this.filterValue - filtersProperty.typedValue.stringValue = JSON.stringify(filters) + filters[this.filterName] = filterExParser.parse(this.filterValue, {hcpId: this.user.healthcarePartyId}) + + filtersProperty.typedValue.stringValue = JSON.stringify(filters) this.set('user.properties',this.user.properties.map(x=>x)) - this.api.user().modifyUser(this.user); + this.api.user().modifyUser(this.user).then(user => this.dispatchEvent(new CustomEvent('user-changed', {detail:user, bubbles: true, composed: true}))) } picture(pat) { @@ -656,24 +653,65 @@

[[localize('save_filter','Save Filter',language)]]

this.$['saveFilterDialog'].open(); } - addSelectedFilter(e){ + deleteFilter(e){ + e.stopPropagation(); - const target = e.target.tagName.toLowerCase()==='paper-item'?e.target:e.target.parentElement - const filterValue = this.filterValue - const jsonValue = JSON.parse(target.dataset.item) + const filtersProperty = this.user.properties.find(p => p.type && p.type.identifier === 'org.taktik.icure.datafilters') || + (this.user.properties[this.user.properties.length] = {type:{identifier:'org.taktik.icure.datafilters'}, typedValue:{type:'STRING', stringValue:'{}'}}) - const type = jsonValue.tagType - const value = jsonValue.tagCode + const filters = JSON.parse(filtersProperty.typedValue.stringValue) + delete(filters[e.target.id]) - if(filterValue != ""){ - this.filterValue = filterValue + " & (\":"+type+"\"== \""+value+"\")"; - }else{ - this.filterValue = "(\":"+type+"\"== \""+value+"\")"; - } + filtersProperty.typedValue.stringValue = JSON.stringify(filters) + + this.set('user.properties',this.user.properties.map(x=>x)) + + this.api.user().modifyUser(this.user).then(user => this.dispatchEvent(new CustomEvent('user-changed', {detail:user, bubbles: true, composed: true}))) + } - this.refresh(); + _activeFilters() { + const filters = this.user.properties.find(p => p.type && p.type.identifier === 'org.taktik.icure.datafilters') + if (filters) { + const parsedFilters = JSON.parse(filters.typedValue.stringValue) + return _.sortBy(Object.keys(parsedFilters).map(k=>({name:k, filter:parsedFilters[k]}))) + } + return [] } + _selectedFilterIndexes(){ + const activeFilters = this._activeFilters() + return this.selectedFilters ? this.selectedFilters.map(f => activeFilters.map(ff=>ff.name).indexOf(f.name)) : [] + } + + _selectedFiltersAsString() { + const filterPrinter = new FilterExPrinter() + return filterPrinter.print(this.selectedFilters.length>1 ? + {"$type":"IntersectionFilter",filters:this.selectedFilters.map(f=>f.filter)}: + this.selectedFilters[0].filter) + } + + _filterValueChanged(filterValue) { + if (this.selectedFilters[0] && this._selectedFiltersAsString() !== this.filterValue) { + this.set('selectedFilters',[]) + } + } + + selectFilter(e) { + const activeFilters = this._activeFilters() + + this.set('selectedFilters',e.target.selectedValues.map(idx=>activeFilters[idx])) + if (this.selectedFilters[0]) { + this.set('filterValue', this._selectedFiltersAsString()) + this.previouslySetFilterValue = this.filterValue + } else { + if (this.filterValue === this.previouslySetFilterValue) { + this.set('filterValue','') + } + } + + this.refresh() + } + } customElements.define(HtPatList.is, HtPatList); diff --git a/web/icure-ht/app/src/elements/ht-tools/ht-my-profile.html b/web/icure-ht/app/src/elements/ht-tools/ht-my-profile.html index d2274bce2e..2ccc6f33cb 100644 --- a/web/icure-ht/app/src/elements/ht-tools/ht-my-profile.html +++ b/web/icure-ht/app/src/elements/ht-tools/ht-my-profile.html @@ -172,7 +172,7 @@ } confirm() { - this.api.user().modifyUser(this.user); + this.api.user().modifyUser(this.user).then(user => this.dispatchEvent(new CustomEvent('user-changed', {detail:user, bubbles: true, composed: true}))) this.api.hcparty().modifyHealthcareParty(this.hcp); } } diff --git a/web/icure-ht/app/src/elements/icc-x-api/filterExPrinter.ts b/web/icure-ht/app/src/elements/icc-x-api/filterExPrinter.ts index b4713d8b44..00d86b0761 100644 --- a/web/icure-ht/app/src/elements/icc-x-api/filterExPrinter.ts +++ b/web/icure-ht/app/src/elements/icc-x-api/filterExPrinter.ts @@ -11,7 +11,7 @@ export class FilterExPrinter { throw 'Unmappable filter '+ex } - print(ex:JSON) { + print(ex:any) { return this.map(ex).print() } } @@ -58,17 +58,17 @@ class UnionFilter extends Filter { class ComparisonFilter extends Filter { leftPart:string rightPart:string - comparator:string + operator:string - constructor(leftPart: string, rightPart: string, comparator: string) { + constructor(leftPart: string, rightPart: string, operator: string) { super('ComparisonFilter'); this.leftPart = leftPart; this.rightPart = rightPart; - this.comparator = comparator; + this.operator = operator; } print() { - return `"${this.leftPart}" ${this.comparator} "${this.rightPart}"` + return `"${this.leftPart}" ${this.operator} "${this.rightPart}"` } } @@ -87,10 +87,13 @@ class ServiceByHcPartyTagCodeDateFilter extends Filter { } print() { - const out = new IntersectionFilter([]) - if (this.codeType) { out.add(new ComparisonFilter(this.codeType,this.codeCode,'=='))} - if (this.tagType) { out.add(new ComparisonFilter(':'+this.tagType,this.tagCode,'=='))} - return out.print() + return ((this.codeType && this.tagType) ? + new IntersectionFilter([ + new ComparisonFilter(this.codeType,this.codeCode,'=='), + new ComparisonFilter(':'+this.tagType,this.tagCode,'==') + ]) : this.codeType ? new ComparisonFilter(this.codeType, this.codeCode,'==') : + new ComparisonFilter(':'+this.tagType, this.tagCode,'==')) + .print() } } diff --git a/web/icure-ht/app/src/ht-app.html b/web/icure-ht/app/src/ht-app.html index 1ac9598909..af8b5c9c6f 100644 --- a/web/icure-ht/app/src/ht-app.html +++ b/web/icure-ht/app/src/ht-app.html @@ -336,7 +336,7 @@ - + @@ -460,7 +460,7 @@ fallback-selection="view404" role="main"> - + @@ -575,6 +575,10 @@ this.set('api', this.$.api) } + _userChanged(e) { + this.set('user',e.detail) + } + _timeCheck(period = 300000) { setTimeout(() => { this.api.fhc().Stscontroller().checkTokenUsingGET(this.api.tokenId).then(isTokenValid => { From fe34d20045d617058201246a1d96039ab9fc569f Mon Sep 17 00:00:00 2001 From: Antoine Duchateau Date: Thu, 7 Jun 2018 14:56:47 +0200 Subject: [PATCH 11/14] Improved GUI and speed --- build.gradle | 2 +- .../org/taktik/icure/entities/Document.java | 5 ++-- submodules/Ektorp | 2 +- .../src/elements/ht-pat/ht-pat-detail.html | 1 - .../app/src/elements/ht-pat/ht-pat-list.html | 28 +++++++++++++------ .../elements/icc-x-api/icc-crypto-x-api.html | 9 ++++-- web/icure-ht/app/src/ht-app-tz.html | 2 +- web/icure-ht/app/src/ht-app.html | 2 +- web/icure-ht/package.json | 3 ++ web/icure-ht/webpack.config.js | 2 +- 10 files changed, 36 insertions(+), 20 deletions(-) diff --git a/build.gradle b/build.gradle index d2d9ae6395..c111ece054 100644 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ configure(allprojects) { group = 'org.taktik.icure' -version = '1.0.8' +version = '1.0.11' sourceCompatibility = 1.8 compileKotlin { kotlinOptions { diff --git a/src/main/java/org/taktik/icure/entities/Document.java b/src/main/java/org/taktik/icure/entities/Document.java index dbe4579dd0..8947b47269 100644 --- a/src/main/java/org/taktik/icure/entities/Document.java +++ b/src/main/java/org/taktik/icure/entities/Document.java @@ -20,14 +20,13 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; import org.taktik.icure.entities.base.StoredICureDocument; -import org.taktik.icure.entities.embed.Delegation; import org.taktik.icure.entities.embed.DocumentStatus; import org.taktik.icure.entities.embed.DocumentType; import java.io.Serializable; -import java.util.*; +import java.util.HashSet; +import java.util.Set; @JsonInclude(JsonInclude.Include.NON_NULL) public class Document extends StoredICureDocument implements Serializable { diff --git a/submodules/Ektorp b/submodules/Ektorp index d77b7778ff..a3272577cd 160000 --- a/submodules/Ektorp +++ b/submodules/Ektorp @@ -1 +1 @@ -Subproject commit d77b7778ffe26b9402493d2f1dcff8cebd352d46 +Subproject commit a3272577cde617d72306a6b6a0d592c1b054873e diff --git a/web/icure-ht/app/src/elements/ht-pat/ht-pat-detail.html b/web/icure-ht/app/src/elements/ht-pat/ht-pat-detail.html index b71039582b..39fa800578 100644 --- a/web/icure-ht/app/src/elements/ht-pat/ht-pat-detail.html +++ b/web/icure-ht/app/src/elements/ht-pat/ht-pat-detail.html @@ -100,7 +100,6 @@ height: calc(100% - 36px); } - paper-fab { --paper-fab-mini: { height: 28px; diff --git a/web/icure-ht/app/src/elements/ht-pat/ht-pat-list.html b/web/icure-ht/app/src/elements/ht-pat/ht-pat-list.html index 500621e22f..ef9dc449ff 100644 --- a/web/icure-ht/app/src/elements/ht-pat/ht-pat-list.html +++ b/web/icure-ht/app/src/elements/ht-pat/ht-pat-list.html @@ -31,7 +31,7 @@ } :host #patients-list { - height: calc(100% - 124px); + height: calc(100% - 140px); outline: none; } @@ -144,14 +144,22 @@ transform: scale(0.8) rotate(180deg); } + .show-all-patients { + left:calc(20% + 16px); + position: absolute; + bottom: 20px; + } + .add-btn-container{ - width: 100%; + width:80%; + left:20%; + position: absolute; + bottom: 16px; + display: flex; flex-direction: row; justify-content: center; align-items: center; - bottom: 16px; - left: 0; margin-top: 2px; } @@ -168,13 +176,15 @@ } .save-btn-container{ - width: 100%; + width:20%; + left:0; + position: absolute; + bottom: 16px; + display: flex; flex-direction: row; justify-content: center; align-items: center; - bottom: 16px; - left: 0; margin-top: 2px; } @@ -317,7 +327,7 @@

Filtres sauvegardés

-
[[localize('save_filter','Save Filter',language)]]
+
[[localize('save_filter','Save Filter',language)]]
@@ -381,8 +391,8 @@

Filtres sauvegardés

- [[localize('show_inactive_patients','Show inactive patients',language)]]
[[localize('add_pat','Add Patient',language)]]
+ [[localize('show_inactive_patients','Show inactive patients',language)]]
diff --git a/web/icure-ht/app/src/elements/icc-x-api/icc-crypto-x-api.html b/web/icure-ht/app/src/elements/icc-x-api/icc-crypto-x-api.html index 2bbb3366b3..210560f9d5 100644 --- a/web/icure-ht/app/src/elements/icc-x-api/icc-crypto-x-api.html +++ b/web/icure-ht/app/src/elements/icc-x-api/icc-crypto-x-api.html @@ -32,7 +32,11 @@ type: Object, value: () => ({}) }, - keychainLocalStoreIdPrefix: { + hcPartyKeysRequestsCache: { + type: Object, + value: () => ({}) + }, + keychainLocalStoreIdPrefix: { type: String, value: 'org.taktik.icure.ehealth.keychain.' }, @@ -678,7 +682,8 @@ } decryptAndImportAesHcPartyKeysForDelegators(delegatorsHcPartyIdsSet, delegateHcPartyId) { - return this.hcpartyApi.getHcPartyKeysForDelegate(delegateHcPartyId).then(function (healthcarePartyKeys) { + + return (this.hcPartyKeysCache[delegateHcPartyId] || (this.hcPartyKeysCache[delegateHcPartyId] = this.hcpartyApi.getHcPartyKeysForDelegate(delegateHcPartyId))).then(function (healthcarePartyKeys) { // For each delegatorId, obtain the AES keys return Promise.all(delegatorsHcPartyIdsSet.map(delegatorId => this.decryptHcPartyKey(delegatorId, delegateHcPartyId, healthcarePartyKeys[delegatorId]))); }.bind(this)); diff --git a/web/icure-ht/app/src/ht-app-tz.html b/web/icure-ht/app/src/ht-app-tz.html index 8422abbbc0..2fda3393aa 100644 --- a/web/icure-ht/app/src/ht-app-tz.html +++ b/web/icure-ht/app/src/ht-app-tz.html @@ -347,7 +347,7 @@ } - + No Ehealth connection diff --git a/web/icure-ht/app/src/ht-app.html b/web/icure-ht/app/src/ht-app.html index 96f50d197d..84a74f1b75 100644 --- a/web/icure-ht/app/src/ht-app.html +++ b/web/icure-ht/app/src/ht-app.html @@ -330,7 +330,7 @@ } - + [[localize('no_ehe_con','No Ehealth connection',language)]] diff --git a/web/icure-ht/package.json b/web/icure-ht/package.json index aa66f5b36c..31f7bcd536 100644 --- a/web/icure-ht/package.json +++ b/web/icure-ht/package.json @@ -3,8 +3,11 @@ "version": "1.0.0", "scripts": { "dev": "node $NODE_DEBUG_OPTION node_modules/webpack/bin/webpack.js --config webpack.config.js", + "dev-tz": "node $NODE_DEBUG_OPTION node_modules/webpack/bin/webpack.js --config webpack.config.tz.js", "build": "webpack --optimize-minimize --config webpack.config.js", + "build-tz": "webpack --optimize-minimize --config webpack.config.tz.js", "serve": "webpack-dev-server --config webpack.config.js", + "serve-tz": "webpack-dev-server --config webpack.config.tz.js", "webpack-defaults": "webpack-defaults", "defaults": "webpack-defaults" }, diff --git a/web/icure-ht/webpack.config.js b/web/icure-ht/webpack.config.js index 055853c143..8c56be9478 100644 --- a/web/icure-ht/webpack.config.js +++ b/web/icure-ht/webpack.config.js @@ -97,7 +97,7 @@ module.exports = { port: 9000, proxy: { '/rest/v1': { - target: /*'https://service.icure.cloud'*/'http://127.0.0.1:16043', + target: 'https://backend.icure.cloud', changeOrigin: true } } From 2de75eb19a530d07478d9d5f6a1fdea67a853f56 Mon Sep 17 00:00:00 2001 From: Antoine Duchateau Date: Thu, 7 Jun 2018 14:57:13 +0200 Subject: [PATCH 12/14] Brought ektorp to latest version --- submodules/Ektorp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/Ektorp b/submodules/Ektorp index a3272577cd..b575407b08 160000 --- a/submodules/Ektorp +++ b/submodules/Ektorp @@ -1 +1 @@ -Subproject commit a3272577cde617d72306a6b6a0d592c1b054873e +Subproject commit b575407b08f7e0fc79a4f5696d20d84f6944e4a2 From 1ac665f42b31977ca261ba34c912e771a4bbd706 Mon Sep 17 00:00:00 2001 From: Antoine Duchateau Date: Thu, 7 Jun 2018 15:25:13 +0200 Subject: [PATCH 13/14] Improved dependencies --- build.gradle | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/build.gradle b/build.gradle index c111ece054..dea40123a5 100644 --- a/build.gradle +++ b/build.gradle @@ -218,6 +218,16 @@ dependencies { testCompile('org.springframework.boot:spring-boot-starter-test') } +task installWebResourcesDependencies(type: Exec) { + group 'build' + description 'Package web resources' + + workingDir "$projectDir/web/icure-ht" + commandLine "npm", "install" + commandLine "bower", "install" +} + + task packageHtWebResources(type: Exec) { group 'build' description 'Package web resources' @@ -234,6 +244,9 @@ task packageTzWebResources(type: Exec) { commandLine "node_modules/.bin/webpack", "--config", "webpack.config.tz.js" } +packageHtWebResources.dependsOn(installWebResourcesDependencies) +packageTzWebResources.dependsOn(installWebResourcesDependencies) + task copyHtWebResources(type: Copy) { from "$projectDir/web/icure-ht/dist" into "${buildDir}/resources/main/static/ht" From 991308101a1e55dda48e894d3018240aacf0b7f1 Mon Sep 17 00:00:00 2001 From: Antoine Duchateau Date: Fri, 8 Jun 2018 09:48:49 +0200 Subject: [PATCH 14/14] Document Message + improved gui --- build.gradle | 7 +++- .../org/taktik/icure/entities/Message.java | 22 +++++++++-- .../dynamic-form/dynamically-loaded-form.html | 4 +- .../app/src/elements/ht-pat/ht-pat-list.html | 38 +++++++++---------- .../src/elements/icc-x-api/filterExPrinter.ts | 15 ++++++++ .../elements/icc-x-api/icc-crypto-x-api.html | 1 - 6 files changed, 61 insertions(+), 26 deletions(-) diff --git a/build.gradle b/build.gradle index dea40123a5..708c9f2d91 100644 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ configure(allprojects) { group = 'org.taktik.icure' -version = '1.0.11' +version = '1.0.15' sourceCompatibility = 1.8 compileKotlin { kotlinOptions { @@ -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' diff --git a/src/main/java/org/taktik/icure/entities/Message.java b/src/main/java/org/taktik/icure/entities/Message.java index ece8f38656..fd277c0ef0 100644 --- a/src/main/java/org/taktik/icure/entities/Message.java +++ b/src/main/java/org/taktik/icure/entities/Message.java @@ -68,14 +68,30 @@ public class Message extends StoredICureDocument implements Serializable { private String formId; private Integer status; private String recipientsType; - private Set recipients = new HashSet<>(); - private Set toAddresses = new HashSet<>(); + private Set recipients = new HashSet<>(); //The id of the hcp whose the message is addressed to + private Set toAddresses = new HashSet<>(); //The address of the recipient of the message. Format is of an email address with extra domains defined for mycarenet and ehealth: (efact.mycarenet.be/eattest.mycarenet.be/chapter4.mycarenet.be/ehbox.ehealth.fgov.be) private Long received; private Long sent; private Map metas = new HashMap<>(); - private String transportGuid; //Usually unique number that identifies a message in a conversation + + /* + CHAP4IN: ${Mycarenet message ref} + CHAP4OUT: ${Mycarenet message ref} + EFACT:BATCH:${iCure batch ref} + EFACT:IN: ${Mycarenet message ref} + EFACT:OUT: ${Mycarenet message ref} + GMD:IN: ${Mycarenet message ref} + INBOX: ${Ehealth box message ref} + SENTBOX: ${Ehealth box message ref} + BININBOX: ${Ehealth box message ref} + BINSENTBOX: ${Ehealth box message ref} + REPORT:IN: ${iCure ref} + REPORT:OUT: ${iCure ref} + */ + + private String transportGuid; //Each message should have a transportGuid: see above for formats private String remark; private String conversationGuid; diff --git a/web/icure-ht/app/src/elements/dynamic-form/dynamically-loaded-form.html b/web/icure-ht/app/src/elements/dynamic-form/dynamically-loaded-form.html index f7c346ddbc..eca68cfa9f 100644 --- a/web/icure-ht/app/src/elements/dynamic-form/dynamically-loaded-form.html +++ b/web/icure-ht/app/src/elements/dynamic-form/dynamically-loaded-form.html @@ -41,9 +41,9 @@ data-provider="[[dataProvider]]" i18n="[[i18n]]" language="[[language]]" resources="[[resources]]" data-map="[[dataMap]]" title="[[form.template.name]]" read-only="[[_isNotInCurrentContact(currentContact, contact)]]" show-title="true" health-elements="[[healthElements]]">
- + - +