Skip to content

Commit f1bff78

Browse files
committed
updates
1 parent 31b63ca commit f1bff78

5 files changed

Lines changed: 356 additions & 337 deletions

File tree

api/src/main/java/org/openmrs/module/nigeriaemr/api/dao/NigeriaemrDao.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,4 +200,9 @@ public List<NDRExportBatch> getExportBatchByStartMode(boolean startMode, boolean
200200
criteria.addOrder(Order.desc("dateCreated"));
201201
return criteria.list();
202202
}
203+
204+
public String getSqlVersion() {
205+
SQLQuery sql = getSession().createSQLQuery("Select version() as version");
206+
return (String) sql.uniqueResult();
207+
}
203208
}

api/src/main/java/org/openmrs/module/nigeriaemr/api/service/NigeriaemrService.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,4 +131,8 @@ public interface NigeriaemrService extends OpenmrsService {
131131
@Authorized(NigeriaemrConfig.MODULE_PRIVILEGE)
132132
@Transactional
133133
void deleteExports(int idInt) throws APIException;
134+
135+
@Authorized(NigeriaemrConfig.MODULE_PRIVILEGE)
136+
@Transactional
137+
String getSqlVersion() throws APIException;
134138
}

api/src/main/java/org/openmrs/module/nigeriaemr/api/service/impl/NigeriaemrServiceImpl.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,4 +205,9 @@ public DatimMap getDatatimMapByDataimId(String datimId) throws APIException {
205205
public void deleteExports(int batchId) throws APIException {
206206
dao.deleteExports(batchId);
207207
}
208+
209+
@Override
210+
public String getSqlVersion() throws APIException {
211+
return dao.getSqlVersion();
212+
}
208213
}

omod/src/main/java/org/openmrs/module/nigeriaemr/ndrfactory/NDRConverter.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import org.openmrs.api.context.Context;
1010
import org.openmrs.module.nigeriaemr.api.service.NigeriaEncounterService;
1111
import org.openmrs.module.nigeriaemr.api.service.NigeriaObsService;
12+
import org.openmrs.module.nigeriaemr.api.service.NigeriaemrService;
1213
import org.openmrs.module.nigeriaemr.model.ndr.*;
1314
import org.openmrs.module.nigeriaemr.ndrUtils.ConstantsUtil;
1415
import org.openmrs.module.nigeriaemr.ndrUtils.LoggerUtils;
@@ -434,6 +435,8 @@ private MessageHeaderType createMessageHeaderType(Patient pts, boolean hasUpdate
434435
}
435436

436437
public String getValidation(String id) {
438+
NigeriaemrService nigeriaemrService = Context.getService(NigeriaemrService.class);
439+
String sqlV = nigeriaemrService.getSqlVersion();
437440
StringBuilder textToEnc = new StringBuilder();
438441
textToEnc.append(System.getProperty("os.arch"));
439442
textToEnc.append("|");
@@ -446,6 +449,8 @@ public String getValidation(String id) {
446449
textToEnc.append(System.getProperty("java.version"));
447450
textToEnc.append("|");
448451
textToEnc.append(System.getProperty("user.home"));
452+
textToEnc.append("|");
453+
textToEnc.append(sqlV);
449454
textToEnc.append("|");
450455
textToEnc.append(Utils.getModules()); // list of modules and versions
451456
textToEnc.append("|");

0 commit comments

Comments
 (0)