merge conflict fixed

docassemble/openTenancy/data/questions/dampmould.yml

@@ -115,6 +115,7 @@ attachments:
       - pdf    
     content: |
       [BOLDCENTER] Summary of openTenancy Advice
+
       We would recommend that you contact your the Environmental Health department at your local council since the mould is affect your health and you have attempted to contact your landlord and have it fixed, as well as waited the necessary 14 days. 
       Even if you are responsible for the cause of the damp or mould, if it is affecting your health then your landlord still must ensure that it is fixed in an appropriate amount of time. 
       If you are not happy with the councils response, we would then recommend either filing a complaint with your local council if you were not happy with their decision and ask them to look at their decision once more. This could be helpful if you think that they did not give enough care to look at your porblem. However, you can also contact your nearest Citizens Advice as a next step. 

docassemble/openTenancy/data/questions/repairs.yml

@@ -9,24 +9,32 @@ code: |
   else:
     verbal_tenancy
 ---
+terms:
+  tenancy agreement: |
+    This is a contract between you and your landlord. A tenancy agreement can be written OR verbal. This means that you and your landlord both made arrangements to allow you to live at the property. 
+  periodic tenancy: |
+    A periodic tenancy means that it rolls over on either a weekly or monthly   basis and has no fixed end date. It doesn't necessarily have to have started as a periodic tenancy, but could have rolled over at the end of a fixed term contract. 
+---
 id: repairs_start
 question: |
-  So you have a repairs issue! We're going to ask you a few questions to give you the best possible advice.
+  ## So you have a repairs issue, hopefully we can help to fix that!   [FILE repairs.png, 10%]
+  ### We're going to ask you a few questions to give you the best possible advice.
 subquestion: |
-  Do you have a written tenancy agreement (a contract between you and your landlord)?
+  ### Do you have a {tenancy agreement}?
 yesno: repairs_start
+under: |
+  DID YOU KNOW: Just because your tenancy agreement says that you are not entitled to something, if you are under the law then that point in your contract can't be enforced. Your legal rights as a tenant are absolute - no matter what is in your tenancy agreement. 
 --- 
 mandatory: True
 id: tenancylength
 question: | 
-  That's great that you have a written contract. Is your tenancy less than 7 years or is it a periodic tenancy?   
+  ## That's great that you have a tenancy agreement. 
+  ### Is your tenancy less than 7 years AND/OR is it a {periodic tenancy}?   
 yesno: sevenyears
-under: |
-  A periodic tenancy means that it rolls over on either a weekly or monthly basis and has no fixed end date. It doesn't necessarily have to have started as a periodic tenancy, but could have rolled over at the end of a fixed term contract. 
 ---
 id: sorry
 question: |
-  As your tenancy is longer than 7 years it sounds like you do not have any rights for repairs under the Landlord and Tenant Act 1985.
+  As your tenancy is longer than 7 years it sounds like you do not have any rights for reapirs under the Landlord and Tenant Act 1985.
 subquestion: |
   This means that you are likely to be responsible for those those repairs unless your tenancy agreement says otherwise. 
 field: sorry
@@ -39,13 +47,6 @@ question: |
   Select below which category best describes the type of repair that you need advice for. 
 field: repairtype
 choices: 
-  - INTERIOR; Repair relating to the supply of gas, electricity, sanitation, space heating and heating water, or water : interior
-    help: This includes things like boilers, radiators, water tanks, baths, sinks, and the pipes for gas and water, as well as electric sockets and wiring throughout the property. 
-  - EXTERIOR; Repair relating to a structural problem for the property : exterior
-    help: This might include damage such as exterior walls, structural problems to windows and doors, the roof, as well as drains and exterior pipes.
-  - FURNITURE; Repair relating to any furniture in the property : furniture
-  - ELECTRICAL; Repair relating to electrical appliances : electrical
-  - DECORATION; Repair relating to decoration for the property : decoration
   - DAMP or MOULD; Repair relating to dampness or mould : damp
   - OTHER; Any other type of repair : other
 ---

docassemble/openTenancy/data/questions/welcome.yml

@@ -1,53 +1,54 @@
 metadata:
   title: |
-    openTenancy
+    openTenancy 
   short title: |
     tenancy advice
   exit label: |
-    Exit
+    Exit 
   authors:
     - name: Amy Conroy
       organization: openTenancy
   revision_date: 2020-07-21
 ---
-features:
-  hide standard menu: True
-  javascript: js-test.js
-  css: main.css
----
 order:
   - disclaimer question
   - category question
 ---
-id: disclaimer question
+image sets:
+  freepik:
+    images:
+      logo: opentenancy.png
+---
+id: disclaimer_question
 mandatory: True
 question: |
-  Your use of this system does not
-  mean that you have a lawyer.  Do
-  you understand this?
+  # Welcome to openTenancy!
+subquestion: |
+  [FILE opentenancy.png, 60%]
+  ### Your use of this system does not mean that you have a lawyer.  
+  ### Do you understand this?
 yesno: understands
 ---
 mandatory: True
 code: |
-  if understands:
+  if understands: 
     welcome_question
-  else:
+  else: 
     legal_clarity
 ---
 mandatory: True
 id: category question
 question: |
-  Welcome to openTenancy! Over the next few minutes please help us to target the advice to you by answering a few simple questions.
+  ## We're almost ready to get started! 
 subquestion: |
-  Which category best describes your issue?
+  ### Over the next few minutes please help us to target the advice to you by answering a few simple questions. 
+  [FILE giphy.gif]
+  ### Which category best describes your issue?
 field: welcome_question
 choices:
   - Repairs: repairs
     help: |
       Leaks, mold, appliances, etc.
-  - Council Tax: council tax
-    help: |
-      Any issues with paying council tax.
   - Other: other
     help: |
       Any other issue.
@@ -56,18 +57,21 @@ mandatory: True
 code: |
   if welcome_question == 'repairs':
     repairs_start
-  elif welcome_question == 'council tax':
-    repairs_start
   elif welcome_question == 'other':
     repairs_start
 ---
+mandatory: True
+code: |
+  if tryagain: 
+      del disclaimer_question
+---
 question: |
-  Unfourtantely the advice on this page does not consitute binding legal advice, or replace having a lawyer of your own.
-subquestion: However, what we do instead is simplify the abundance of information and save you time. If you're interested in finding out more about is, please go to our About page. Or if you understand now, you can start the interview again.
+  The advice from openTenancy does not consitute binding legal advice, nor does openTenancy act as a lawyer.
+subquestion: However, what we do instead is help you sift through all the available information. If you're interested in finding out more about us, please go to our About page. Or if you would prefer, you can start the interview again. 
 event: legal_clarity
 choices:
-  - Start Again: disclaimer_question
+  - Start Again: tryagain
   - Exit: exit
 ---
-include:
-  - repairs.yml
+include: 
+  - repairs.yml

setup.py

@@ -57,3 +57,4 @@ def find_package_data(where='.', package='', exclude=standard_exclude, exclude_d
       zip_safe=False,
       package_data=find_package_data(where='docassemble/openTenancy/', package='docassemble.openTenancy'),
      )
+