From e79a2c3b9b3a50fa1a8ddb79c45aedbd86d4f568 Mon Sep 17 00:00:00 2001 From: tbembersimeao Date: Fri, 5 Oct 2018 11:57:42 -0400 Subject: [PATCH 1/3] Preventing "Unsupported operands types" error --- ExternalModule.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ExternalModule.php b/ExternalModule.php index fa93f8e..24818fc 100644 --- a/ExternalModule.php +++ b/ExternalModule.php @@ -303,6 +303,10 @@ function getFormsAccessMatrix($event_id = null, $record = null) { $logic = Calculate::formatCalcToPHP($logic, $Proj); $logic = LogicTester::logicPrependEventName($logic, $events_names[$event_id]); + + if (empty($data[$event_id])) { + $data[$event_id] = array(); + } $data[$event_id] += array($fake_field => ''); $controls[$i]['value'] = (string) LogicTester::evaluateCondition($logic, $data); From 5c4cf7b8c986e4fe1a4b612afca1b306b366554f Mon Sep 17 00:00:00 2001 From: Philip Chase Date: Wed, 12 Dec 2018 11:28:24 -0500 Subject: [PATCH 2/3] Move authors from config.json to authors.md and add Marly as an author --- AUTHORS.md | 2 +- config.json | 19 ++----------------- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index 241e3f8..8f9a8fe 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -6,4 +6,4 @@ David R Nelson, Director of the University of Florida Clinical Translational Sci The authors would like to thank Teddy S. Youn, MD and Katharina Busl, M.D., M.S. of the Division of Neurocritical Care at University of Florida for the concepts behind the creation of this software and the funding to write it. Andy Martin named it. -We want to thank our developers Dileep Rajput rajputd@ufl.edu, Stewart Wehmeyer swehmeyer@ufl.edu, Sreeja Kannagundla sreejakannagundl@ufl.edu, Surya Prasanna suryayalla@ufl.edu, Prasad Lanka planka@ufl.edu, Taryn Stoffs tls@ufl.edu, and Philip Chase pbc@ufl.edu for their contributions to the project. +We want to thank our developers Tiago Bember tbembersimeao@ufl.edu, Marly Cormar marlycormar@ufl.edu, Dileep Rajput rajputd@ufl.edu, Stewart Wehmeyer swehmeyer@ufl.edu, Sreeja Kannagundla sreejakannagundl@ufl.edu, Surya Prasanna suryayalla@ufl.edu, Prasad Lanka planka@ufl.edu, Taryn Stoffs tls@ufl.edu, and Philip Chase pbc@ufl.edu for their contributions to the project. diff --git a/config.json b/config.json index f3031df..79401f9 100644 --- a/config.json +++ b/config.json @@ -22,23 +22,8 @@ "institution": "University of Florida - CTSI" }, { - "name": "Prasad Lanka", - "email": "planka@ufl.edu", - "institution": "University of Florida - CTSI" - }, - { - "name": "Surya Prasanna", - "email": "suryayalla@ufl.edu", - "institution": "University of Florida - CTSI" - }, - { - "name": "Dileep Rajput", - "email": "rajputd@ufl.edu", - "institution": "University of Florida - CTSI" - }, - { - "name": "Stewart Wehmeyer", - "email": "swehmeyer@ufl.edu", + "name": "Marly Cormar", + "email": "marlycormar@ufl.edu", "institution": "University of Florida - CTSI" }, { From 6a814f6fba00a021eec04f08594290c8b30c901b Mon Sep 17 00:00:00 2001 From: Philip Chase Date: Wed, 12 Dec 2018 11:29:36 -0500 Subject: [PATCH 3/3] Update Changelog for release 3.3.4 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c290c0b..e0690f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ All notable changes to the Form Render Skip Logic module will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [3.3.4] - 2018-12-12 +### Changed +- Move authors from config.json to authors.md and add Marly as an author (Philip Chase) +- Preventing "Unsupported operands types" error (tbembersimeao) + + ## [3.3.3] - 2018-08-16 ### Changed - Fixing wrong behavior of "Control mode" field on config form: part II. (Tiago Bember Simeao)