From b6fc57e78705020fe805c09bfaabc70a01e3d731 Mon Sep 17 00:00:00 2001
From: fcanon <fcanon@nowhere.na>
Date: Thu, 11 May 2017 16:43:29 -0400
Subject: [PATCH] restore pregmod exclusive RA activation conditions
---
src/uncategorized/rulesAssistant.tw | 34 +++++++++++++++++++++++++++++
src/utility/raWidgets.tw | 6 ++---
2 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/src/uncategorized/rulesAssistant.tw b/src/uncategorized/rulesAssistant.tw
index a90317672fb..dd1b4a16021 100644
--- a/src/uncategorized/rulesAssistant.tw
+++ b/src/uncategorized/rulesAssistant.tw
@@ -218,6 +218,40 @@ __Rule $r Automatic Activation__
<<RAChangeApply>>
<</link>>
|
+<<link "Lactation">>
+ <<unset _customCondition>>
+ <<set $currentRule.condition = changeVariable($currentRule.condition, "lactation")>>
+ <<RAChangeActivation>>
+ <<RAChangeSave>>
+ <<RAChangeApply>>
+<</link>>
+|
+<<link "Pregnancy">>
+ <<unset _customCondition>>
+ <<set $currentRule.condition = changeVariable($currentRule.condition, "preg")>>
+ <<RAChangeActivation>>
+ <<RAChangeSave>>
+ <<RAChangeApply>>
+<</link>>
+|
+<<link "Pregnancy Multiples">>
+ <<unset _customCondition>>
+ <<set $currentRule.condition = changeVariable($currentRule.condition, "pregType")>>
+ <<RAChangeActivation>>
+ <<RAChangeSave>>
+ <<RAChangeApply>>
+<</link>>
+<<if $bellyImplants == 1>>
+|
+<<link "Belly implant">>
+ <<unset _customCondition>>
+ <<set $currentRule.condition = changeVariable($currentRule.condition, "bellyImplant")>>
+ <<RAChangeActivation>>
+ <<RAChangeSave>>
+ <<RAChangeApply>>
+<</link>>
+<</if>>
+|
<<link "Custom">>
<<if (def _customConditionOld)>>
<<set _customCondition = _customConditionOld>>
diff --git a/src/utility/raWidgets.tw b/src/utility/raWidgets.tw
index 93cf738c880..b82f9403555 100644
--- a/src/utility/raWidgets.tw
+++ b/src/utility/raWidgets.tw
@@ -128,11 +128,11 @@
<br>@@.red;Fat@@: over 30 to 95, @@.red;Overweight@@: over 95
<<case "lactation">>
<br>// 0 - none, 1 - natural, 2 - lactation implant. //
- <<case "pregnancy week">>
+ <<case "preg">>
<br>// >1 - pregnancy week(s), 0 - not pregnant, -1 - on contraceptives, -2 - barren. //
- <<case "pregnancy foetuses">>
+ <<case "pregType">>
<br>// Fetus count, rule can be applied only after week 10 of pregnancy. //
- <<case "belly implant volume">>
+ <<case "bellyImplant">>
<br>// Volume of belly implant in ccs. 0 - none. //
<<case "custom">>
<br>// Enter custom condition. //
--
GitLab