From f835e0da10515dee9c8fcf849dd71dd1397aa465 Mon Sep 17 00:00:00 2001 From: Jon Sayer Date: Mon, 16 Sep 2019 15:41:16 -0700 Subject: [PATCH 1/5] changes to form requested on TBGSM-246 --- src/classes/C501_CTRL_ClassReg_CreateAcct.cls | 55 ++++++++++------ ...1_Class_Registration_Confirmation_VF.email | 3 + src/labels/CustomLabels.labels | 64 ++++++++++++++++++- .../School_Term__c-School Term Layout.layout | 4 ++ src/objects/Contact.object | 7 +- src/objects/School_Term__c.object | 10 +++ src/package.xml | 8 +++ src/pages/C501_ClassReg_CreateAcct.page | 60 +++++++++++++---- src/pages/C501_ClassReg_Login.page | 4 +- .../C501_Registration_Site_User.permissionset | 5 ++ 10 files changed, 179 insertions(+), 41 deletions(-) diff --git a/src/classes/C501_CTRL_ClassReg_CreateAcct.cls b/src/classes/C501_CTRL_ClassReg_CreateAcct.cls index 1237e43..e754776 100644 --- a/src/classes/C501_CTRL_ClassReg_CreateAcct.cls +++ b/src/classes/C501_CTRL_ClassReg_CreateAcct.cls @@ -10,6 +10,7 @@ public class C501_CTRL_ClassReg_CreateAcct { public Account schoolNameText {get; set;} public Boolean dontKnowId {get; set;} public Boolean noAllergies {get; set;} + public Boolean noMedication {get; set;} public Map > fieldSetPicklistOptions {get; set;} public Map siteMultiPicklistReturnValues {get; set;} @@ -50,6 +51,7 @@ public class C501_CTRL_ClassReg_CreateAcct { public Boolean noStuID {get; set;} public Boolean noAllergyResp {get; set;} private String RegType {get; set;} + public Boolean noMedResp {get; set;} public List schoolList { get { @@ -133,6 +135,8 @@ public class C501_CTRL_ClassReg_CreateAcct { dontKnowId = false; noStuID = false; noAllergyResp = false; + noMedication = false; + noMedResp = false; needPickup = false; schoolregion = ''; errorClassesForPicklists = ''; @@ -243,6 +247,12 @@ public class C501_CTRL_ClassReg_CreateAcct { passValidation = false; } else { noStuId = false; + // populate the checkbox that tells TBG they can get permission to ask the school for the ID + if(dontKnowId && term.Student_School_ID__c == null){ + term.Permission_to_get_student_ID__c = true; + } else if(!dontKnowId && term.Student_School_ID__c != null){ + term.Permission_to_get_student_ID__c = false; + } } if(child.Allergies__c == null && noAllergies == false){ @@ -253,6 +263,14 @@ public class C501_CTRL_ClassReg_CreateAcct { noAllergyResp = false; } + if(child.Medication__c == null && noMedication == false){ + ApexPages.addMessage(new ApexPages.message(ApexPages.severity.ERROR,Label.C501_RegSite_NoMedsError ) ); + noMedResp = true; + passValidation = false; + } else { + noMedResp = false; + } + if(child.Student_Transportation__c == 'Will receive a ride' && (child.Authorized_Pickup_1_Name__c == null || child.Authorized_Pickup_1_Phone__c == null || child.Authorized_Pickup_1_Relationship__c == null ) ){ ApexPages.addMessage(new ApexPages.message(ApexPages.severity.ERROR,Label.C501_RegSite_PickUpChildError ) ); needPickup = true; @@ -375,36 +393,35 @@ public class C501_CTRL_ClassReg_CreateAcct { } system.debug( 'SchoolName after validation attempts: ' + schoolName ); - if(passValidation == true){ - errorClassesForPicklists = ''; - // make sure they checked something in each of the required picklists - for(String key : siteMultiPicklistReturnValues.keySet() ){ - if(/*key != 'Family_Status__c' && */siteMultiPicklistReturnValues.get(key).size() == 0 ){ - passValidation = false; - if(String.isEmpty(errorClassesForPicklists)){ - errorClassesForPicklists = ' .picklist' + key; - } else { - errorClassesForPicklists = errorClassesForPicklists + ', .picklist' + key; - } - siteMultiPicklistErrorStatus.put( key, true); - ApexPages.addMessage(new ApexPages.message(ApexPages.severity.ERROR, Label.C501_Classreg_CheckBoxes ) ); + //if(passValidation == true){ + errorClassesForPicklists = ''; + // make sure they checked something in each of the required picklists + for(String key : siteMultiPicklistReturnValues.keySet() ){ + if(/*key != 'Family_Status__c' && */siteMultiPicklistReturnValues.get(key).size() == 0 ){ + passValidation = false; + if(String.isEmpty(errorClassesForPicklists)){ + errorClassesForPicklists = ' .picklist' + key; } else { - siteMultiPicklistErrorStatus.put( key, false); + errorClassesForPicklists = errorClassesForPicklists + ', .picklist' + key; } + siteMultiPicklistErrorStatus.put( key, true); + ApexPages.addMessage(new ApexPages.message(ApexPages.severity.ERROR, Label.C501_Classreg_CheckBoxes ) ); + } else { + siteMultiPicklistErrorStatus.put( key, false); } } + //} + if(passValidation == false){ + system.debug('Failed Validation :( '); + return null; + } // Convert all of the values in the Checklist value sets to the correct picklist values on the correct record loopThroughFieldsetAndSetValues(child,childFieldSet); loopThroughFieldsetAndSetValues(parent,parentFieldSet); loopThroughFieldsetAndSetValues(family,hhFieldSet); - if(passValidation == false){ - system.debug('Failed Validation :( '); - return null; - } - insert family; parent.npe01__Preferred_Email__c = 'Personal'; diff --git a/src/email/unfiled$public/C501_Class_Registration_Confirmation_VF.email b/src/email/unfiled$public/C501_Class_Registration_Confirmation_VF.email index 63fb8d2..70fd530 100644 --- a/src/email/unfiled$public/C501_Class_Registration_Confirmation_VF.email +++ b/src/email/unfiled$public/C501_Class_Registration_Confirmation_VF.email @@ -386,6 +386,9 @@ To do: field to calculate the grade... ** {! $ObjectType.Contact.Fields['Allergies__c'].inlineHelpText } ** +** {! $ObjectType.Contact.Fields['Medication__c'].inlineHelpText } ** + + **{! $ObjectType.Contact.Fields['Race__c'].inlineHelpText }** diff --git a/src/labels/CustomLabels.labels b/src/labels/CustomLabels.labels index 56dcf15..998afa1 100644 --- a/src/labels/CustomLabels.labels +++ b/src/labels/CustomLabels.labels @@ -405,6 +405,27 @@ We may also look at your child’s school information, like attendance and cours C501_Classreg_CheckBoxes Please complete all required multiple-choice questions. + + C501_RegSite_ChildCanDoSurvey + en_US + false + C501_RegSite_ChildCanDoSurvey + Yes, my child may participate in the study. (If no, leave unchecked). + + + C501_RegSite_ChildCanDoSurveyFalse + en_US + false + C501_RegSite_ChildCanDoSurveyFalse + Your child may *not* participate in the study + + + C501_RegSite_ChildCanDoSurveyTrue + en_US + false + C501_RegSite_ChildCanDoSurveyTrue + Your child may participate in the study + C501_RegSite_ChildEmail en_US @@ -561,7 +582,27 @@ We may also look at your child’s school information, like attendance and cours en_US false C501_RegSite_Login - Log in + Register your child for Techbridge Girls! + + + C501_RegSite_LoginIntro + en_US + false + C501_RegSite_LoginIntro + <p>Dear Parents and Guardians,</p> + +<p>We are pleased to offer your child the opportunity to join Techbridge Girls, an after-school science, engineering, and technology program for girls. Techbridge Girls programs are free and meet every week for 1.5 - 2 hours at your child’s school.</p> + +<p>In this program, your child will:</p> + +<ul> +<li>Learn science, engineering, and technology concepts </li> +<li>Do hands-on projects that build confidence, teamwork, perseverance, and problem-solving skills</li> +<li>Explore science, engineering, and technology careers</li> +<li>For more information on our programs, visit www.techbridgegirls.org</li> +</ul> + +<p><strong>Please provide a cell phone number or email address to continue.</strong></p> C501_RegSite_NoAllergies @@ -577,6 +618,20 @@ We may also look at your child’s school information, like attendance and cours C501_RegSite_NoAllergiesError Please indicate if your child has any food allergies or restrictions. + + C501_RegSite_NoMedication + en_US + false + C501_RegSite_NoMedication + No Health Conditions + + + C501_RegSite_NoMedsError + en_US + false + C501_RegSite_NoMedsError + Please indicate if your child has any medical conditions we should be aware of. + C501_RegSite_NotProvided en_US @@ -626,6 +681,13 @@ We may also look at your child’s school information, like attendance and cours C501_RegSite_PlzAreaCode Please include area code: (###) ###-#### + + C501_RegSite_PlzFillItAllOut + en_US + false + C501_RegSite_PlzFillItAllOut + Please fill out all of (or as much as possible) the following information for the child you wish to register for a Techbridge Girls program. The demographic information in this form is used anonymously. We collect it to show our partners the populations of students in our programs. + C501_RegSite_ProvidePhoneEmail en_US diff --git a/src/layouts/School_Term__c-School Term Layout.layout b/src/layouts/School_Term__c-School Term Layout.layout index b875267..8beb668 100644 --- a/src/layouts/School_Term__c-School Term Layout.layout +++ b/src/layouts/School_Term__c-School Term Layout.layout @@ -39,6 +39,10 @@ Edit Parent_Initials__c + + Edit + Permission_to_get_student_ID__c + diff --git a/src/objects/Contact.object b/src/objects/Contact.object index 60eddb0..a6a4ec9 100644 --- a/src/objects/Contact.object +++ b/src/objects/Contact.object @@ -3,11 +3,6 @@ C501_Class_Registration_Site_Child Used by the class registration site to define the fields used on the child contact. - - Medication__c - false - false - Race__c false @@ -347,7 +342,7 @@ Medication__c false - Please check if your child has any health condition(s) that Techbridge Girls should be aware of: + Does your child have any health condition(s) that Techbridge Girls should be aware of? If Yes, please explain. If No, please check the box below. 32768 false diff --git a/src/objects/School_Term__c.object b/src/objects/School_Term__c.object index e2ead6f..5c686aa 100644 --- a/src/objects/School_Term__c.object +++ b/src/objects/School_Term__c.object @@ -276,6 +276,16 @@ TRUE, FALSE ) false Lookup + + Permission_to_get_student_ID__c + false + false + The parent does not know the student's school ID, but gives us permission to get it. + + false + false + Checkbox + Post_Survey__c false diff --git a/src/package.xml b/src/package.xml index f6287b0..fd44f56 100644 --- a/src/package.xml +++ b/src/package.xml @@ -90,6 +90,7 @@ School_Term__c.Parent_Packet__c School_Term__c.Parent_Survey__c School_Term__c.Parent__c + School_Term__c.Permission_to_get_student_ID__c School_Term__c.Post_Survey__c School_Term__c.Pre_Survey__c School_Term__c.Program_Day__c @@ -167,6 +168,9 @@ C501_ClassReg_seattleArea C501_ClassReg_southBay C501_Classreg_CheckBoxes + C501_RegSite_ChildCanDoSurvey + C501_RegSite_ChildCanDoSurveyFalse + C501_RegSite_ChildCanDoSurveyTrue C501_RegSite_ChildEmail C501_RegSite_ChildFirstName C501_RegSite_ChildLastName @@ -189,8 +193,11 @@ C501_RegSite_LeaveBlank C501_RegSite_LeaveBlankEmail C501_RegSite_Login + C501_RegSite_LoginIntro C501_RegSite_NoAllergies C501_RegSite_NoAllergiesError + C501_RegSite_NoMedication + C501_RegSite_NoMedsError C501_RegSite_NotProvided C501_RegSite_ParentContactRequired C501_RegSite_ParentEmail @@ -198,6 +205,7 @@ C501_RegSite_ParentLastName C501_RegSite_PickUpChildError C501_RegSite_PlzAreaCode + C501_RegSite_PlzFillItAllOut C501_RegSite_ProvidePhoneEmail C501_RegSite_ProvideStudentId C501_RegSite_RememberMeDevice diff --git a/src/pages/C501_ClassReg_CreateAcct.page b/src/pages/C501_ClassReg_CreateAcct.page index d66b121..256474b 100644 --- a/src/pages/C501_ClassReg_CreateAcct.page +++ b/src/pages/C501_ClassReg_CreateAcct.page @@ -1,11 +1,6 @@ -
-
- -
-
@@ -38,6 +33,18 @@
+
+
+ +
+
+
+
+

+ {! $Label.C501_RegSite_PlzFillItAllOut } +

+
+
@@ -420,6 +427,21 @@
+
+
+
+
+ + {! $Label.C501_RegSite_NoMedication } + + +
+ Error: {! $Label.C501_ClassReg_PlzSelectOne } +
+ +
+
+
@@ -1073,6 +1095,20 @@
+
+
+
+ + + {! $Label.C501_RegSite_NoMedication } + + + + + +
+
+
@@ -1311,17 +1347,17 @@

- +

- +

-

+

diff --git a/src/pages/C501_ClassReg_Login.page b/src/pages/C501_ClassReg_Login.page index cdbffdd..9395410 100644 --- a/src/pages/C501_ClassReg_Login.page +++ b/src/pages/C501_ClassReg_Login.page @@ -15,9 +15,7 @@
-

- {! $Label.C501_RegSite_ProvidePhoneEmail } -

+

diff --git a/src/permissionsets/C501_Registration_Site_User.permissionset b/src/permissionsets/C501_Registration_Site_User.permissionset index d8bb10e..cef3669 100644 --- a/src/permissionsets/C501_Registration_Site_User.permissionset +++ b/src/permissionsets/C501_Registration_Site_User.permissionset @@ -350,6 +350,11 @@ School_Term__c.Parent__c true + + false + School_Term__c.Permission_to_get_student_ID__c + false + true School_Term__c.Post_Survey__c From 6f33ac3e41f7764a5d57b7ceb95a51acf1cd8f19 Mon Sep 17 00:00:00 2001 From: Jon Sayer Date: Wed, 18 Sep 2019 10:26:04 -0700 Subject: [PATCH 2/5] Finalizing changes requested after initial deploy --- src/classes/C501_CTRL_ClassReg_CreateAcct.cls | 12 +++++++ src/classes/C501_TEST_ClassReg_CreateAcct.cls | 2 ++ src/labels/CustomLabels.labels | 14 ++++++++ src/objects/Contact.object | 5 --- src/package.xml | 2 ++ src/pages/C501_ClassReg_CreateAcct.page | 32 +++++++++++++++++++ 6 files changed, 62 insertions(+), 5 deletions(-) diff --git a/src/classes/C501_CTRL_ClassReg_CreateAcct.cls b/src/classes/C501_CTRL_ClassReg_CreateAcct.cls index e754776..7c6863e 100644 --- a/src/classes/C501_CTRL_ClassReg_CreateAcct.cls +++ b/src/classes/C501_CTRL_ClassReg_CreateAcct.cls @@ -11,6 +11,7 @@ public class C501_CTRL_ClassReg_CreateAcct { public Boolean dontKnowId {get; set;} public Boolean noAllergies {get; set;} public Boolean noMedication {get; set;} + public Boolean noSpecialNeeds {get; set;} public Map > fieldSetPicklistOptions {get; set;} public Map siteMultiPicklistReturnValues {get; set;} @@ -52,6 +53,7 @@ public class C501_CTRL_ClassReg_CreateAcct { public Boolean noAllergyResp {get; set;} private String RegType {get; set;} public Boolean noMedResp {get; set;} + public Boolean noSpecialResp {get; set;} public List schoolList { get { @@ -138,6 +140,8 @@ public class C501_CTRL_ClassReg_CreateAcct { noMedication = false; noMedResp = false; needPickup = false; + noSpecialResp = false; + noSpecialNeeds = false; schoolregion = ''; errorClassesForPicklists = ''; @@ -271,6 +275,14 @@ public class C501_CTRL_ClassReg_CreateAcct { noMedResp = false; } + if(child.Student_Special_Needs__c == null && noSpecialNeeds == false){ + ApexPages.addMessage(new ApexPages.message(ApexPages.severity.ERROR,Label.C501_RegSite_NoSpecialNeedsError ) ); + noSpecialResp = true; + passValidation = false; + } else { + noSpecialResp = false; + } + if(child.Student_Transportation__c == 'Will receive a ride' && (child.Authorized_Pickup_1_Name__c == null || child.Authorized_Pickup_1_Phone__c == null || child.Authorized_Pickup_1_Relationship__c == null ) ){ ApexPages.addMessage(new ApexPages.message(ApexPages.severity.ERROR,Label.C501_RegSite_PickUpChildError ) ); needPickup = true; diff --git a/src/classes/C501_TEST_ClassReg_CreateAcct.cls b/src/classes/C501_TEST_ClassReg_CreateAcct.cls index 862f234..2857301 100644 --- a/src/classes/C501_TEST_ClassReg_CreateAcct.cls +++ b/src/classes/C501_TEST_ClassReg_CreateAcct.cls @@ -155,6 +155,8 @@ public class C501_TEST_ClassReg_CreateAcct { controller.term.Student_School_ID__c = 'abc123'; controller.noAllergies = true; + controller.noSpecialNeeds = true; + controller.noMedication = true; controller.child.Student_Transportation__c = 'Will receive a ride'; controller.child.Authorized_Pickup_1_Name__c = 'Test friend'; controller.child.Authorized_Pickup_1_Phone__c = '(206) 234-5678'; diff --git a/src/labels/CustomLabels.labels b/src/labels/CustomLabels.labels index 998afa1..a56ac9c 100644 --- a/src/labels/CustomLabels.labels +++ b/src/labels/CustomLabels.labels @@ -632,6 +632,20 @@ We may also look at your child’s school information, like attendance and cours C501_RegSite_NoMedsError Please indicate if your child has any medical conditions we should be aware of. + + C501_RegSite_NoNeeds + en_US + false + C501_RegSite_NoNeeds + My child has no special needs. + + + C501_RegSite_NoSpecialNeedsError + en_US + false + C501_RegSite_NoSpecialNeedsError + Please indicate if your child has any special needs, or check the box if there are none. + C501_RegSite_NotProvided en_US diff --git a/src/objects/Contact.object b/src/objects/Contact.object index a6a4ec9..2d3e037 100644 --- a/src/objects/Contact.object +++ b/src/objects/Contact.object @@ -8,11 +8,6 @@ false false - - Student_Special_Needs__c - false - false - T_shirt_Size__c false diff --git a/src/package.xml b/src/package.xml index fd44f56..2df8830 100644 --- a/src/package.xml +++ b/src/package.xml @@ -198,6 +198,8 @@ C501_RegSite_NoAllergiesError C501_RegSite_NoMedication C501_RegSite_NoMedsError + C501_RegSite_NoNeeds + C501_RegSite_NoSpecialNeedsError C501_RegSite_NotProvided C501_RegSite_ParentContactRequired C501_RegSite_ParentEmail diff --git a/src/pages/C501_ClassReg_CreateAcct.page b/src/pages/C501_ClassReg_CreateAcct.page index 256474b..95d2f80 100644 --- a/src/pages/C501_ClassReg_CreateAcct.page +++ b/src/pages/C501_ClassReg_CreateAcct.page @@ -490,6 +490,22 @@

+
+
+
+
+ + {! $Label.C501_RegSite_NoNeeds } + + +
+ Error: {! $Label.C501_RegSite_NoSpecialNeedsError } +
+ +
+
+
+

@@ -1123,6 +1139,22 @@

+
+
+
+ + + {! $Label.C501_RegSite_NoNeeds } + + + + + +
+
+
+ +
From df12253ce6f48b9b4bba4694dbc8df6b2ffc8d29 Mon Sep 17 00:00:00 2001 From: Jon Sayer Date: Mon, 21 Oct 2019 09:27:54 -0700 Subject: [PATCH 3/5] Changes up to 10/21 --- .vscode/settings.json | 2 +- cumulusci.yml | 5 +- src/classes/C501_CTRL_ClassReg_CreateAcct.cls | 42 +- src/classes/C501_TEST_ClassReg_CreateAcct.cls | 1 + src/labels/CustomLabels copy.labels | 810 ++++++++++++++++++ src/labels/CustomLabels.labels | 84 +- .../School_Term__c-School Term Layout.layout | 59 +- src/objects/Account.object | 39 +- src/objects/Contact.object | 436 +--------- src/objects/School_Term__c.object | 370 +++++++- src/package.xml | 80 +- src/pages/C501_ClassReg_CreateAcct.page | 34 +- .../C501_ClassReg_CreateAcct.page-meta.xml | 2 +- .../C501_Registration_Site_User.permissionset | 214 ++++- 14 files changed, 1603 insertions(+), 575 deletions(-) create mode 100644 src/labels/CustomLabels copy.labels diff --git a/.vscode/settings.json b/.vscode/settings.json index 1498891..39f71a1 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,3 @@ { - "eslint.nodePath": "c:\\Users\\DaveB\\.vscode\\extensions\\salesforce.salesforcedx-vscode-lwc-45.15.1\\node_modules" + "eslint.nodePath": "c:\\Users\\Jon\\.vscode\\extensions\\salesforce.salesforcedx-vscode-lwc-46.16.0\\node_modules" } \ No newline at end of file diff --git a/cumulusci.yml b/cumulusci.yml index 98476ee..fecc9a6 100644 --- a/cumulusci.yml +++ b/cumulusci.yml @@ -2,6 +2,9 @@ project: name: Salesforce-Class-Registration package: name: Salesforce-Class-Registration - api_version: '45.0' + api_version: '46.0' + dependencies: + - github: https://github.com/SalesforceFoundation/Cumulus + - github: https://github.com/SalesforceFoundation/Volunteers-for-Salesforce diff --git a/src/classes/C501_CTRL_ClassReg_CreateAcct.cls b/src/classes/C501_CTRL_ClassReg_CreateAcct.cls index 7c6863e..bb45236 100644 --- a/src/classes/C501_CTRL_ClassReg_CreateAcct.cls +++ b/src/classes/C501_CTRL_ClassReg_CreateAcct.cls @@ -49,6 +49,7 @@ public class C501_CTRL_ClassReg_CreateAcct { public Boolean noSchool {get; set;} public Boolean noGrade {get; set;} public Boolean noWaiver {get; set;} + public Boolean noMedAuth {get; set;} public Boolean noStuID {get; set;} public Boolean noAllergyResp {get; set;} private String RegType {get; set;} @@ -134,6 +135,7 @@ public class C501_CTRL_ClassReg_CreateAcct { noSchool = false; noGrade = false; noWaiver = false; + noMedAuth = false; dontKnowId = false; noStuID = false; noAllergyResp = false; @@ -172,7 +174,7 @@ public class C501_CTRL_ClassReg_CreateAcct { Schema.SObjectField f = fsm.getSObjectField(); Schema.DescribeFieldResult dfr = f.getDescribe(); if(dfr.getType() == Schema.DisplayType.MultiPicklist ){ - List picklistOptionsForField = getFieldsPicklistOptions(f,'Account'); + List picklistOptionsForField = getFieldsPicklistOptions(f,'Account',language); fieldSetPicklistOptions.put( dfr.getName(), picklistOptionsForField ); siteMultiPicklistReturnValues.put( dfr.getName(), new String[]{} ); siteMultiPicklistErrorStatus.put( dfr.getName(), false); @@ -182,7 +184,7 @@ public class C501_CTRL_ClassReg_CreateAcct { Schema.SObjectField f = fsm.getSObjectField(); Schema.DescribeFieldResult dfr = f.getDescribe(); if(dfr.getType() == Schema.DisplayType.MultiPicklist ){ - List picklistOptionsForField = getFieldsPicklistOptions(f,'Contact'); + List picklistOptionsForField = getFieldsPicklistOptions(f,'Contact',language); fieldSetPicklistOptions.put( dfr.getName(), picklistOptionsForField ); siteMultiPicklistReturnValues.put( dfr.getName(), new String[]{} ); siteMultiPicklistErrorStatus.put( dfr.getName(), false); @@ -192,7 +194,7 @@ public class C501_CTRL_ClassReg_CreateAcct { Schema.SObjectField f = fsm.getSObjectField(); Schema.DescribeFieldResult dfr = f.getDescribe(); if(dfr.getType() == Schema.DisplayType.MultiPicklist ){ - List picklistOptionsForField = getFieldsPicklistOptions(f,'Contact'); + List picklistOptionsForField = getFieldsPicklistOptions(f,'Contact',language); fieldSetPicklistOptions.put( dfr.getName(), picklistOptionsForField ); siteMultiPicklistReturnValues.put( dfr.getName(), new String[]{} ); siteMultiPicklistErrorStatus.put( dfr.getName(), false); @@ -304,6 +306,16 @@ public class C501_CTRL_ClassReg_CreateAcct { noWaiver = false; } + if(term.Authorization_to_treat_minor__c == false){ + ApexPages.addMessage(new ApexPages.message(ApexPages.severity.ERROR,Label.C501_RegSite_TreatRequired) ); + noMedAuth = true; + passValidation = false; + } else { + noMedAuth = false; + } + + + Boolean phoneFail = false; // Phone number validation @@ -468,6 +480,7 @@ public class C501_CTRL_ClassReg_CreateAcct { term.School_Year__c = C501_UTIL_ClassRegUtilities.currentSchoolYear( Date.today() ); term.C501_Sign_Up_Source__c = 'Online'; + term.C501_Form_Completion_Language__c = language; insert term; if(parent.MobilePhone != null && parent.MobilePhone != '' ){ @@ -546,9 +559,8 @@ public class C501_CTRL_ClassReg_CreateAcct { List regions = new List(); // include these nice regions automatically - regions.add(new SelectOption( '', Label.C501_ClassReg_PlzSelectOne ) ); - regions.add(new SelectOption( 'East Bay', Label.C501_ClassReg_eastBay ) ); - regions.add(new SelectOption( 'South Bay', Label.C501_ClassReg_southBay ) ); + regions.add(new SelectOption( '', Label.C501_ClassReg_PlzSelectOne ) ); + regions.add(new SelectOption( 'California', Label.C501_RegSite_California ) ); regions.add(new SelectOption( 'Seattle', Label.C501_ClassReg_seattleArea ) ); regions.add(new SelectOption( 'DC', Label.C501_ClassReg_dcArea ) ); @@ -559,14 +571,26 @@ public class C501_CTRL_ClassReg_CreateAcct { return regions; } - public static List getFieldsPicklistOptions(Schema.SObjectField field,String objectName){ + public static List getFieldsPicklistOptions(Schema.SObjectField field,String objectName, String language){ List picklistOptions = new List(); Schema.DescribeFieldResult fieldResult = field.getDescribe(); - list values = fieldResult.getPickListValues(); + list values = fieldResult.getPickListValues(); + + /*if(!String.isEmpty(language) && language != 'en_US' ){ + // is not english + //Schema. + } else { + // return English picklist + for (Schema.PicklistEntry p : values){ + picklistOptions.add(new SelectOption(p.getLabel(), p.getValue())); + } + }*/ + + // return English picklist values for (Schema.PicklistEntry p : values){ - picklistOptions.add(new SelectOption(p.getLabel(), p.getValue())); + picklistOptions.add(new SelectOption(p.getLabel(), p.getValue())); } diff --git a/src/classes/C501_TEST_ClassReg_CreateAcct.cls b/src/classes/C501_TEST_ClassReg_CreateAcct.cls index 2857301..65924fc 100644 --- a/src/classes/C501_TEST_ClassReg_CreateAcct.cls +++ b/src/classes/C501_TEST_ClassReg_CreateAcct.cls @@ -152,6 +152,7 @@ public class C501_TEST_ClassReg_CreateAcct { controller.grade = '10'; controller.schoolName = school.Id; controller.term.Waiver__c = true; + controller.term.Authorization_to_treat_minor__c = true; controller.term.Student_School_ID__c = 'abc123'; controller.noAllergies = true; diff --git a/src/labels/CustomLabels copy.labels b/src/labels/CustomLabels copy.labels new file mode 100644 index 0000000..a56ac9c --- /dev/null +++ b/src/labels/CustomLabels copy.labels @@ -0,0 +1,810 @@ + + + + C501_ClassReg_AND + en_US + false + C501_ClassReg_AND + and + + + C501_ClassReg_AddtlStudentInfo + en_US + false + C501_ClassReg_AddtlStudentInfo + Additional Student Information + + + C501_ClassReg_AuthPickup + en_US + false + C501_ClassReg_AuthPickup + If you selected "Someone will pick up my child", What is the name of someone authorized to pick up your child? + + + C501_ClassReg_AuthToTreatMinor + en_US + false + C501_ClassReg_AuthToTreatMinor + AUTHORIZATION TO TREAT MINOR (in case of emergency) + + + C501_ClassReg_AuthToTreatMinorLabel + en_US + false + C501_ClassReg_AuthToTreatMinorLabel + By checking this box, I acknowledge that I have read, understood and consent to the terms of this Authorization. + + + C501_ClassReg_AuthToTreatMinorP1 + en_US + false + C501_ClassReg_AuthToTreatMinorP1 + I do hereby certify that to the best of my knowledge and belief, my child or ward is physically able to participate in the Techbridge Girls After-School program. + + + C501_ClassReg_AuthToTreatMinorP2 + en_US + false + C501_ClassReg_AuthToTreatMinorP2 + In the event that I, or the other parent/guardian listed below, cannot be reached in an emergency, I hereby give permission to the Techbridge Girls staff to secure proper medical treatment for my child. I do hereby consent to whatever medical, surgical or dental treatment is considered necessary in the best judgment of the attending health care provider. I further understand that I am fully responsible for the costs of any such care/treatment. + + + C501_ClassReg_AuthToTreatMinorProvider + en_US + false + C501_ClassReg_AuthToTreatMinorProvider + My preferred medical provider (if applicable): + + + C501_ClassReg_Birthday + en_US + false + C501_ClassReg_Birthday + Student Birthdate + + + C501_ClassReg_ChildMobilePhone + en_US + false + C501_ClassReg_ChildMobilePhone + Student's Mobile Phone Number (if any) + + + C501_ClassReg_ChildSchoolName + en_US + false + C501_ClassReg_ChildSchoolName + Student's School + + + C501_ClassReg_ChildSchoolRegion + en_US + false + C501_ClassReg_ChildSchoolRegion + Techbridge serves girls in four different regions. Which region is your child's school in? + + + C501_ClassReg_CodeMessage + en_US + false + C501_ClassReg_CodeMessage + Your Techbridge Girls verification code is + + + C501_ClassReg_CodeMessageDisclaim + en_US + false + C501_ClassReg_CodeMessageDisclaim + . This phone number is unmonitored. + + + C501_ClassReg_CodeMessageExpire + en_US + false + C501_ClassReg_CodeMessageExpire + Code expires in 30 min. + + + C501_ClassReg_ConfirmCodeSubject + en_US + false + C501_ClassReg_ConfirmCodeSubject + Your Techbridge Girls Confirmation Code + + + C501_ClassReg_EmergencySubtext + en_US + false + C501_ClassReg_EmergencySubtext + In case the parent/guardian cannot be reached, please provide an EMERGENCY CONTACT (other than yourself). + + + C501_ClassReg_EvalStudy + en_US + false + C501_ClassReg_EvalStudy + Evaluation Study Form + + + C501_ClassReg_EvalStudyH1 + en_US + false + C501_ClassReg_EvalStudyH1 + What is an evaluation study? + + + C501_ClassReg_EvalStudyH1P1 + en_US + false + C501_ClassReg_EvalStudyH1P1 + Evaluation studies help us learn new things about our programs at Techbridge Girls. We can test new ideas and see how we are doing. This helps us make the best program for your child and for youth who take part in Techbridge Girls in the future. + + + C501_ClassReg_EvalStudyH1P2 + en_US + false + C501_ClassReg_EvalStudyH1P2 + We are doing this study to find out more about how youth learn and enjoy our programs. We would like to know what you and the youth in the program think about the program and what they do there. + + + C501_ClassReg_EvalStudyH1P3 + en_US + false + C501_ClassReg_EvalStudyH1P3 + This paper talks about the study and the choice that you have to take part in it. You can ask questions any time. We will also talk with the youth in the program and ask if they want to be part of the evaluation. + + + C501_ClassReg_EvalStudyH2 + en_US + false + C501_ClassReg_EvalStudyH2 + Important things to know... + + + C501_ClassReg_EvalStudyH2li + en_US + false + C501_ClassReg_EvalStudyH2li + <li>We are asking if both you and your child will participate in the study. +</li> + <li> +You decide if you and your child want to take part. +</li> +<li> +You can say ‘No’ or you can say ‘Yes’. +</li> +<li> +No one will be upset if you say ‘No’. +</li> +<li> +If you say ‘Yes’, you can always say ‘No’ later. +</li> +<li> +Your child can participate in the study even if you do not. You can participate in the study even if your child does not. +</li> + + + C501_ClassReg_EvalStudyH3 + en_US + false + C501_ClassReg_EvalStudyH3 + What would happen if I join this evaluation study? + + + C501_ClassReg_EvalStudyH3P1 + en_US + false + C501_ClassReg_EvalStudyH3P1 + If you decide to participate in the study, we would ask you and your child to do the following: + + + C501_ClassReg_EvalStudyH3li + en_US + false + C501_ClassReg_EvalStudyH3li + <li> +Questions for you: We would ask you to read questions on a piece of paper or online. Then you would mark your answers on the paper or online form. +</li> +<li> +Questions for your child: We would ask your child to read questions on a piece of paper or online. Then your child would mark their answers on the paper or online form. +</li> +<li> +Talking with your child: A person on the evaluation team would talk to a group of youth and ask them questions. Then your child would answer the questions out loud. +</li> +<li> +We may also look at your child’s school information, like attendance and courses taken. +</li> + + + C501_ClassReg_FreeLunch + en_US + false + C501_ClassReg_FreeLunch + Does your child qualify for free/reduced lunch? + + + C501_ClassReg_HHhomePhone + en_US + false + C501_ClassReg_ParentHomePhone + Parent/Guardian's Home Phone + + + C501_ClassReg_OneOrMore + en_US + false + C501_ClassReg_OneOrMore + Please select at least one + + + C501_ClassReg_PARTICIPANT_WAIVER + en_US + false + C501_ClassReg_PARTICIPANT WAIVER + PARTICIPANT WAIVER + + + C501_ClassReg_PARTICIPANT_WAIVERlabel + en_US + false + C501_ClassReg_PARTICIPANT_WAIVERlabel + By checking this box, I acknowledge that I have read, understood and consent to the terms of this Waiver. + + + C501_ClassReg_PARTICIPANT_WAIVERp1 + en_US + false + C501_ClassReg_PARTICIPANT_WAIVERp1 + My child or ward has my permission to participate in the Techbridge Girls After-School program (the “Program”). + + + C501_ClassReg_PARTICIPANT_WAIVERp2 + en_US + false + C501_ClassReg_PARTICIPANT_WAIVERp2 + I recognize that Techbridge Girls has not undertaken any duty or responsibility for the safety of my child or ward, and I agree to assume the full responsibility for all risk of bodily injury, death, disability, and/or property damage as a result of my child or ward’s participation in the Program. + + + C501_ClassReg_PARTICIPANT_WAIVERp3 + en_US + false + C501_ClassReg_PARTICIPANT_WAIVERp3 + By my signature, I confirm that I understand the risks involved as a result of my child or ward participating in the Program, and I willingly and voluntarily accept these risks on my child or ward’s behalf. I hereby surrender any right to seek reimbursement from Techbridge Girls and its directors, officers, employees, volunteers and other agents (hereafter collectively “Techbridge Girls Releases”) for any injury sustained and/or any liability incurred during my child’s or ward’s participation in the program. I further release and hold harmless the Techbridge Girls Releases from any and all claims, demands, or causes of action which arise from my child’s or ward’s participation in the Program. + + + C501_ClassReg_ParentHomePhone + en_US + false + C501_ClassReg_ParentHomePhone + Parent/Guardian Home Phone + + + C501_ClassReg_ParentMobilePhone + en_US + false + C501_ClassReg_ParentMobilePhone + Parent/Guardian Mobile Phone + + + C501_ClassReg_ParentWorkPhone + en_US + false + C501_ClassReg_ParentWorkPhone + Parent/Guardian Work Phone + + + C501_ClassReg_PhoneFail + en_US + false + C501_ClassReg_PhoneFail + Please check the phone numbers you provided. + + + C501_ClassReg_PhoneFailSpecific + en_US + false + C501_ClassReg_PhoneFailSpecific + This not a valid phone number. + + + C501_ClassReg_PhotoVideo + en_US + false + C501_ClassReg_PhotoVideo + PHOTO and VIDEO RELEASE + + + C501_ClassReg_PhotoVideoLabel + en_US + false + C501_ClassReg_PhotoVideoLabel + By checking this box, I acknowledge that YES I give my permission. (Leave unchecked if you DO NOT give permission.) + + + C501_ClassReg_PhotoVideoP1 + en_US + false + C501_ClassReg_PhotoVideoP1 + Occasionally, Techbridge Girls program activities may be photographed, videotaped, and/or audio taped for educational, publicity or fundraising purposes. Please indicate if you give permission for you and/or your child or ward to appear in videos, photos and/or audio recordings without compensation (e.g., as part of brochures, slide shows or program websites). Your authorization below also permits Techbridge Girls to share photos and other media depicting you and/or your child or ward with partner organizations for use in their promotions of Techbridge Girls events and programs. + + + C501_ClassReg_PickUpChild + en_US + false + C501_ClassReg_PickUpChild + Persons allowed to pick up my child: + + + C501_ClassReg_PlzSelectOne + en_US + false + C501_ClassReg_PlzSelectOne + Please Select One + + + C501_ClassReg_StudentID + en_US + false + C501_ClassReg_StudentID + Student ID # + + + C501_ClassReg_SubmitApplication + en_US + false + C501_ClassReg_SubmitApplication + Submit Application + + + C501_ClassReg_WaiverRequired + en_US + false + C501_ClassReg_WaiverRequired + You must check the box to sign the Participant Waiver. This is not optional. + + + C501_ClassReg_dcArea + en_US + false + C501_ClassReg_dcArea + Washington DC Area + + + C501_ClassReg_eastBay + en_US + false + C501_ClassReg_eastBay + East San Francisco Bay Area (eg. Oakland) + + + C501_ClassReg_parentFamilyConsent + en_US + false + C501_ClassReg_parentFamilyConsent + PARENT/FAMILY CONSENT FORM + + + C501_ClassReg_seattleArea + en_US + false + C501_ClassReg_seattleArea + Seattle Area + + + C501_ClassReg_southBay + en_US + false + C501_ClassReg_southBay + South San Francisco Bay Area (eg. San Jose) + + + C501_Classreg_CheckBoxes + en_US + false + C501_Classreg_CheckBoxes + Please complete all required multiple-choice questions. + + + C501_RegSite_ChildCanDoSurvey + en_US + false + C501_RegSite_ChildCanDoSurvey + Yes, my child may participate in the study. (If no, leave unchecked). + + + C501_RegSite_ChildCanDoSurveyFalse + en_US + false + C501_RegSite_ChildCanDoSurveyFalse + Your child may *not* participate in the study + + + C501_RegSite_ChildCanDoSurveyTrue + en_US + false + C501_RegSite_ChildCanDoSurveyTrue + Your child may participate in the study + + + C501_RegSite_ChildEmail + en_US + false + C501_RegSite_ChildEmail + Student's Email Address (if any) + + + C501_RegSite_ChildFirstName + en_US + false + C501_RegSite_ChildFirstName + Student First Name + + + C501_RegSite_ChildLastName + en_US + false + C501_RegSite_ChildLastName + Student Last Name + + + C501_RegSite_City + en_US + false + C501_RegSite_City + City + + + C501_RegSite_CodeMismatch + en_US + false + C501_RegSite_CodeMismatch + That doesn't seem to match the code we sent you. Try again? + + + C501_RegSite_ConfirmContact + en_US + false + C501_RegSite_ConfirmContact + <p>If you have any questions or notice a mistake in your responses below, please contact the following regional coordinators based on where your student attends school:</p> + +<p>California or Pacific Northwest (WA, ID, OR, MT, AK) - <a href="mailto:lkraushaar@techbridgegirls.org">lkraushaar@techbridgegirls.org</a></p> + +<p>Washington DC Metro - <a href="mailto:cjames@techbridgegirls.org">cjames@techbridgegirls.org</a></p> + + + C501_RegSite_ConfirmMessageSite + en_US + false + C501_RegSite_ConfirmMessageSite + We have received your application. We have sent a confirmation message to the Email Address or Phone Number you provided. A copy of your application is below. Feel free to save or print this for your records. + + + C501_RegSite_ConfirmSMS + en_US + false + C501_RegSite_ConfirmSMS + Thanks for registering for Techbridge Girls @ + + + C501_RegSite_Continue + en_US + false + C501_RegSite_Continue + Continue + + + C501_RegSite_DontKnowID + en_US + false + C501_RegSite_DontKnowID + Check here if you don't know and authorize Techbridge Girls to get this from your child's school. + + + C501_RegSite_EmailConfirmP2 + en_US + false + C501_RegSite_EmailConfirmP2 + ! The programs begins on + + + C501_RegSite_EmailConfirmP3 + en_US + false + C501_RegSite_EmailConfirmP3 + with + + + C501_RegSite_EmailConfirmP4 + en_US + false + C501_RegSite_EmailConfirmP4 + . Please contact the Techbridge Teacher at your school or community site for any questions. + + + C501_RegSite_EmergencyContacts + en_US + false + C501_RegSite_EmergencyContacts + Emergency Contacts + + + C501_RegSite_FamilyInformation + en_US + false + C501_RegSite_FamilyInformation + Family Information + + + C501_RegSite_FinishedApp + en_US + false + C501_RegSite_FinishedApp + Your Application is Complete + + + C501_RegSite_FirstName + en_US + false + C501_RegSite_ParentFirstName + Parent/Guardian First Name + + + C501_RegSite_Grade + en_US + false + C501_RegSite_Grade + Grade (for 2018-19 school year) + + + C501_RegSite_InvalidEmailPhone + en_US + false + C501_RegSite_InvalidEmailPhone + That is not a valid email address or phone number. Please try again. + + + C501_RegSite_LeaveBlank + en_US + false + C501_RegSite_LeaveBlank + Leave blank if you do not have one. + + + C501_RegSite_LeaveBlankEmail + en_US + false + C501_RegSite_LeaveBlank + Leave blank if you do not have one. + + + C501_RegSite_Login + en_US + false + C501_RegSite_Login + Register your child for Techbridge Girls! + + + C501_RegSite_LoginIntro + en_US + false + C501_RegSite_LoginIntro + <p>Dear Parents and Guardians,</p> + +<p>We are pleased to offer your child the opportunity to join Techbridge Girls, an after-school science, engineering, and technology program for girls. Techbridge Girls programs are free and meet every week for 1.5 - 2 hours at your child’s school.</p> + +<p>In this program, your child will:</p> + +<ul> +<li>Learn science, engineering, and technology concepts </li> +<li>Do hands-on projects that build confidence, teamwork, perseverance, and problem-solving skills</li> +<li>Explore science, engineering, and technology careers</li> +<li>For more information on our programs, visit www.techbridgegirls.org</li> +</ul> + +<p><strong>Please provide a cell phone number or email address to continue.</strong></p> + + + C501_RegSite_NoAllergies + en_US + false + C501_RegSite_NoAllergies + No Food Restrictions or Allergies + + + C501_RegSite_NoAllergiesError + en_US + false + C501_RegSite_NoAllergiesError + Please indicate if your child has any food allergies or restrictions. + + + C501_RegSite_NoMedication + en_US + false + C501_RegSite_NoMedication + No Health Conditions + + + C501_RegSite_NoMedsError + en_US + false + C501_RegSite_NoMedsError + Please indicate if your child has any medical conditions we should be aware of. + + + C501_RegSite_NoNeeds + en_US + false + C501_RegSite_NoNeeds + My child has no special needs. + + + C501_RegSite_NoSpecialNeedsError + en_US + false + C501_RegSite_NoSpecialNeedsError + Please indicate if your child has any special needs, or check the box if there are none. + + + C501_RegSite_NotProvided + en_US + false + C501_RegSite_NotProvided + Not provided + + + C501_RegSite_ParentContactRequired + en_US + false + C501_RegSite_ParentContactRequired + Please enter a contact method (phone number or email) for the parent. We need to be able to contact you! + + + C501_RegSite_ParentEmail + en_US + false + C501_RegSite_ParentEmail + Parent/Guardian Email + + + C501_RegSite_ParentFirstName + en_US + false + C501_RegSite_ParentFirstName + Parent/Guardian First Name + + + C501_RegSite_ParentLastName + en_US + false + C501_RegSite_ParentLastName + Parent/Guardian Last Name + + + C501_RegSite_PickUpChildError + en_US + false + C501_RegSite_PickUpChildError + Please identify someone who can pick up your child from the program. + + + C501_RegSite_PlzAreaCode + en_US + false + C501_RegSite_PlzAreaCode + Please include area code: (###) ###-#### + + + C501_RegSite_PlzFillItAllOut + en_US + false + C501_RegSite_PlzFillItAllOut + Please fill out all of (or as much as possible) the following information for the child you wish to register for a Techbridge Girls program. The demographic information in this form is used anonymously. We collect it to show our partners the populations of students in our programs. + + + C501_RegSite_ProvidePhoneEmail + en_US + false + C501_RegSite_ProvidePhoneEmail + Please provide your phone number or email address to access the student registration system. + + + C501_RegSite_ProvideStudentId + en_US + false + C501_RegSite_ProvideStudentId + Please provide a Student ID Number, or give us permission to get it from your child's school. + + + C501_RegSite_RememberMeDevice + en_US + false + C501_RegSite_RememberMeDevice + Remember me on this device. + + + C501_RegSite_SMSweSentAnEmail + en_US + false + C501_RegSite_SMSweSentAnEmail + An email with registration info has been sent to + + + C501_RegSite_SelectGrade + en_US + false + C501_RegSite_SelectGrade + Please Select a Grade + + + C501_RegSite_SelectSchool + en_US + false + C501_RegSite_SelectSchool + Please Select a School + + + C501_RegSite_SelectState + en_US + false + C501_RegSite_SelectState + Please Select a State + + + C501_RegSite_SiteRegFormTitle + en_US + false + C501_RegSite_SiteRegFormTitle + Techbridge Girls Student Registration Form + + + C501_RegSite_State + en_US + false + C501_RegSite_State + State + + + C501_RegSite_StreetAddress + en_US + false + C501_RegSite_StreetAddress + Street Address + + + C501_RegSite_StudentInformation + en_US + false + C501_RegSite_StudentInformation + Student Information + + + C501_RegSite_Transport + en_US + false + C501_RegSite_Transport + Transportation and Authorized Pickup + + + C501_RegSite_WeSentYouCode + en_US + false + C501_RegSite_WeSentYouCode + We just sent you code to the phone number or email address you provided. What is the code? + + + C501_RegSite_Youarenotauthenticated + en_US + false + C501_RegSite_Youarenotauthenticated + You are not authenticated + + + C501_RegSite_ZipCode + en_US + false + C501_RegSite_ZipCode + Zip Code + + diff --git a/src/labels/CustomLabels.labels b/src/labels/CustomLabels.labels index a56ac9c..a1f7ded 100644 --- a/src/labels/CustomLabels.labels +++ b/src/labels/CustomLabels.labels @@ -75,14 +75,14 @@ en_US false C501_ClassReg_ChildSchoolName - Student's School + Student's School / Program Location C501_ClassReg_ChildSchoolRegion en_US false C501_ClassReg_ChildSchoolRegion - Techbridge serves girls in four different regions. Which region is your child's school in? + Techbridge serves girls in three different regions. Which region is your child's school in? C501_ClassReg_CodeMessage @@ -96,7 +96,7 @@ en_US false C501_ClassReg_CodeMessageDisclaim - . This phone number is unmonitored. + . This account is unmonitored. C501_ClassReg_CodeMessageExpire @@ -117,7 +117,7 @@ en_US false C501_ClassReg_EmergencySubtext - In case the parent/guardian cannot be reached, please provide an EMERGENCY CONTACT (other than yourself). + In case the parent/guardian cannot be reached, please provide two EMERGENCY CONTACTS (other than yourself). C501_ClassReg_EvalStudy @@ -152,7 +152,7 @@ en_US false C501_ClassReg_EvalStudyH1P3 - This paper talks about the study and the choice that you have to take part in it. You can ask questions any time. We will also talk with the youth in the program and ask if they want to be part of the evaluation. + This paper talks about the study and the choice that you have to let your child take part in it. You can ask questions any time. C501_ClassReg_EvalStudyH2 @@ -166,10 +166,7 @@ en_US false C501_ClassReg_EvalStudyH2li - <li>We are asking if both you and your child will participate in the study. -</li> - <li> -You decide if you and your child want to take part. + <li>You decide if you want your child to take part. </li> <li> You can say ‘No’ or you can say ‘Yes’. @@ -181,7 +178,7 @@ No one will be upset if you say ‘No’. If you say ‘Yes’, you can always say ‘No’ later. </li> <li> -Your child can participate in the study even if you do not. You can participate in the study even if your child does not. +Saying 'No' or 'Yes' will not affect your child's participation in Techbridge Girls in any way. </li> @@ -189,14 +186,14 @@ Your child can participate in the study even if you do not. You can participate en_US false C501_ClassReg_EvalStudyH3 - What would happen if I join this evaluation study? + What would happen if my child joins this evaluation study? C501_ClassReg_EvalStudyH3P1 en_US false C501_ClassReg_EvalStudyH3P1 - If you decide to participate in the study, we would ask you and your child to do the following: + If you decide to participate in the study, we would ask your child to do the following: C501_ClassReg_EvalStudyH3li @@ -204,16 +201,13 @@ Your child can participate in the study even if you do not. You can participate false C501_ClassReg_EvalStudyH3li <li> -Questions for you: We would ask you to read questions on a piece of paper or online. Then you would mark your answers on the paper or online form. -</li> -<li> -Questions for your child: We would ask your child to read questions on a piece of paper or online. Then your child would mark their answers on the paper or online form. +Talking with your child: A person on the evaluation team would talk your child, either individually or as part of a group of youth and ask them questions. Then your child would answer the questions out loud. </li> <li> -Talking with your child: A person on the evaluation team would talk to a group of youth and ask them questions. Then your child would answer the questions out loud. +Type answers to our questions on a computer. </li> <li> -We may also look at your child’s school information, like attendance and courses taken. +We will also look at your child’s school information, like attendance, grades, and courses taken. </li> @@ -405,6 +399,13 @@ We may also look at your child’s school information, like attendance and cours C501_Classreg_CheckBoxes Please complete all required multiple-choice questions. + + C501_RegSite_California + en_US + false + C501_RegSite_California + California + C501_RegSite_ChildCanDoSurvey en_US @@ -468,9 +469,11 @@ We may also look at your child’s school information, like attendance and cours C501_RegSite_ConfirmContact <p>If you have any questions or notice a mistake in your responses below, please contact the following regional coordinators based on where your student attends school:</p> -<p>California or Pacific Northwest (WA, ID, OR, MT, AK) - <a href="mailto:lkraushaar@techbridgegirls.org">lkraushaar@techbridgegirls.org</a></p> +<p>California - Tonesha Russell <a href="mailto:trussell@techbridgegirls.org">trussell@techbridgegirls.org</a></p> -<p>Washington DC Metro - <a href="mailto:cjames@techbridgegirls.org">cjames@techbridgegirls.org</a></p> +<p>Pacific Northwest (WA, ID, OR, MT, AK) - Lauren Kraushaar <a href="mailto:lkraushaar@techbridgegirls.org">lkraushaar@techbridgegirls.org</a></p> + +<p>Washington DC Metro - Nuri Rashied <a href="mailto:nrashied@techbridgegirls.org">nrashied@techbridgegirls.org</a></p> C501_RegSite_ConfirmMessageSite @@ -535,6 +538,13 @@ We may also look at your child’s school information, like attendance and cours C501_RegSite_FamilyInformation Family Information + + C501_RegSite_Family_Status_c + en_US + false + C501_RegSite_Family_Status_c + &nbsp; + C501_RegSite_FinishedApp en_US @@ -554,7 +564,7 @@ We may also look at your child’s school information, like attendance and cours en_US false C501_RegSite_Grade - Grade (for 2018-19 school year) + Grade (for 2019-20 school year) C501_RegSite_InvalidEmailPhone @@ -702,12 +712,19 @@ We may also look at your child’s school information, like attendance and cours C501_RegSite_PlzFillItAllOut Please fill out all of (or as much as possible) the following information for the child you wish to register for a Techbridge Girls program. The demographic information in this form is used anonymously. We collect it to show our partners the populations of students in our programs. + + C501_RegSite_Preferred_Method_of_Contact_c + en_US + false + C501_RegSite_Preferred_Method_of_Contact_c + &nbsp; + C501_RegSite_ProvidePhoneEmail en_US false C501_RegSite_ProvidePhoneEmail - Please provide your phone number or email address to access the student registration system. + Please provide your phone number or email address to access the student registration system. Your phone number or email address will be used to receive an access code. C501_RegSite_ProvideStudentId @@ -716,6 +733,13 @@ We may also look at your child’s school information, like attendance and cours C501_RegSite_ProvideStudentId Please provide a Student ID Number, or give us permission to get it from your child's school. + + C501_RegSite_Race_c + en_US + false + C501_RegSite_Race_c + &nbsp; + C501_RegSite_RememberMeDevice en_US @@ -786,12 +810,26 @@ We may also look at your child’s school information, like attendance and cours C501_RegSite_Transport Transportation and Authorized Pickup + + C501_RegSite_TreatRequired + en_US + false + C501_RegSite_TreatRequired + You must check the box authorizing us to seek medical treatment for your child in an emergency. This is not optional. + + + C501_RegSite_Volunteer_c + en_US + false + C501_RegSite_Volunteer_c + &nbsp; + C501_RegSite_WeSentYouCode en_US false C501_RegSite_WeSentYouCode - We just sent you code to the phone number or email address you provided. What is the code? + We just sent you a code to the phone number or email address you provided. What is the code? C501_RegSite_Youarenotauthenticated diff --git a/src/layouts/School_Term__c-School Term Layout.layout b/src/layouts/School_Term__c-School Term Layout.layout index 8beb668..473636e 100644 --- a/src/layouts/School_Term__c-School Term Layout.layout +++ b/src/layouts/School_Term__c-School Term Layout.layout @@ -60,27 +60,6 @@ - - true - false - true - - - - Edit - Left_Program_Early__c - - - Edit - Left_Program_Early_Date__c - - - Edit - Notes__c - - - - true true @@ -99,10 +78,6 @@ Edit Post_Survey__c - - Edit - Free_reduced_lunch__c - @@ -132,6 +107,33 @@ + + true + true + true + + + + Readonly + Number_of_Weeks_Attended__c + + + + + Edit + Left_Program_Early__c + + + Edit + Left_Program_Early_Date__c + + + Edit + Notes__c + + + + false true @@ -174,7 +176,12 @@ Contract__c - + + + Edit + Free_reduced_lunch__c + + diff --git a/src/objects/Account.object b/src/objects/Account.object index 29dbf80..fbe70e4 100644 --- a/src/objects/Account.object +++ b/src/objects/Account.object @@ -49,19 +49,6 @@ SUBSTITUTE(C501_Class_Site_Mobile_Number__c, "(", ""), " false Date - - Primary_Teacher__c - SetNull - false - - Contact - Accounts (Primary Teacher) - Schools - false - false - false - Lookup - Region__c false @@ -93,31 +80,25 @@ SUBSTITUTE(C501_Class_Site_Mobile_Number__c, "(", ""), " false + + California + false + + - Secondary_Teacher__c + School_District_Lookup__c SetNull false - - Contact - Accounts (Secondary Teacher) - Accounts + + Account + Schools in District + DistrictSchools false false false Lookup - - Teachers_at_Site__c - false - Primary_Teacher__r.FirstName & ' ' & Primary_Teacher__r.LastName - BlankAsZero - - false - false - Text - false - diff --git a/src/objects/Contact.object b/src/objects/Contact.object index 2d3e037..0f8e980 100644 --- a/src/objects/Contact.object +++ b/src/objects/Contact.object @@ -289,6 +289,27 @@ 5 + + Graduation_Year__c + false + Grade in 2018-19 school year: +4th- 2027 +5th- 2026 +6th- 2025 +7th- 2024 +8th- 2023 +9th- 2022 +10th-2021 +11th-2020 +12th-2019 + + 25 + false + false + false + Text + false + Income__c false @@ -345,328 +366,6 @@ LongTextArea 3 - - Number_in_Household_Picklist__c - false - How many people live in your household: - - false - false - false - Picklist - - true - - false - - 2 - false - - - - 3 - false - - - - 4 - false - - - - 5 - false - - - - 6 - false - - - - 7 - false - - - - 8 - false - - - - 9 - false - - - - 10 - false - - - - More than 10 - false - - - - - - - Number_in_Household__c - As reported by Parent (not based on Household Account) - false - How many people live in your household (2, 3, 4, 5, etc.): - - 18 - false - 0 - false - false - Number - false - - - Parent_Education__c - What level of education did the parent finish? - false - How far did you go in school? I finished… - - false - false - false - Picklist - - - false - - Elementary school - false - - - - Middle school - false - - - - High school diploma or G.E.D. - false - - - - Trade/vocational school certificate - false - - - - 2-year college degree - false - - - - 4-year college degree - false - - - - Master's degree - false - - - - Ph.D., M.D., J.D. or other professional degree - false - - - - Does not apply - false - - - - Decline to Answer - false - - - - - - - Parent_Education_second_parent__c - What level did of education did the second parent finish? - false - If applicable, please indicate how far your child’s other parent or guardian went in school? He/she finished… - - false - false - false - Picklist - - - false - - Elementary school, - false - - - - Middle school - false - - - - High school diploma or G.E.D. - false - - - - Trade/vocational school certificate - false - - - - 2-year college degree - false - - - - 4-year college degree - false - - - - Master's degree - false - - - - Ph.D., M.D., J.D. or other professional degree - false - - - - I don't know - false - - - - Does not apply - false - - - - Decline to Answer - false - - - - - - - Parent_Workplace__c - From the Form Assembly parent packet only. Add Parent's primary affiliation by hand. - false - Parent Workplace/Occupation - - 255 - false - false - false - Text - false - - - Preferred_Method_of_Contact__c - false - Which way would you prefer we contact you? - - false - false - false - MultiselectPicklist - - - false - - Email - false - - - - Phone - false - - - - Text - false - - - - - 3 - - - Race__c - false - Which best describes your child (please select all that apply): - - false - false - false - MultiselectPicklist - - - false - - American Indian/Alaska Native - false - - - - African American/Black - false - - - - Asian - false - - - - Hispanic/Latina - false - - - - Middle Eastern - false - - - - Native Hawaiian/Other Pacific Islander - false - - - - White - false - - - - Other - false - - - - Declined To Answer - false - - - - - 5 - Student_Special_Needs__c false @@ -710,52 +409,6 @@ - - T_shirt_Size__c - false - What size T-shirt does your child wear? - - false - false - false - Picklist - - true - - false - - X Small - false - - - - Small - false - - - - Medium - false - - - - Large - false - - - - X Large - false - - - - 2X Large - false - - - - - Translation_Needed_Other__c false @@ -829,51 +482,4 @@ - - Volunteer__c - How a parent would like to volunteer with Techbridge. - false - If you are able to volunteer this year, please let us know how you can help: (Select all that apply) - - false - false - false - MultiselectPicklist - - - false - - Not able to volunteer - false - - - - Make calls - false - - - - Make bilingual calls - false - - - - Chaperone on a field trip (middle and high school only) - false - - - - Able to help drive children to local events - false - - - - Other - false - - - - - 5 - diff --git a/src/objects/School_Term__c.object b/src/objects/School_Term__c.object index 5c686aa..942ff65 100644 --- a/src/objects/School_Term__c.object +++ b/src/objects/School_Term__c.object @@ -24,6 +24,18 @@ false Checkbox + + C501_Form_Completion_Language__c + false + The language the form was completed in. + + 255 + false + false + false + Text + false + C501_Free_Reduced_Lunch_Picklist__c false @@ -188,6 +200,49 @@ TRUE, FALSE ) LongTextArea 3 + + Number_of_Weeks_Attended__c + false + IF( Week_1_Attendance__c = TRUE, 1, 0) + +IF (Week_2_Attendance__c = TRUE, 1, 0) + +IF (Week_3_Attendance__c = TRUE, 1, 0) + +IF (Week_4_Attendance__c = TRUE, 1, 0) + +IF (Week_5_Attendance__c = TRUE, 1, 0) + +IF (Week_6_Attendance__c = TRUE, 1, 0) + +IF (Week_7_Attendance__c = TRUE, 1, 0) + +IF (Week_8_Attendance__c = TRUE, 1, 0) + +IF (Week_9_Attendance__c = TRUE, 1, 0) + +IF (Week_10_Attendance__c = TRUE, 1, 0) + +IF (Week_11_Attendance__c = TRUE, 1, 0) + +IF (Week_12_Attendance__c = TRUE, 1, 0) + +IF (Week_13_Attendance__c = TRUE, 1, 0) + +IF (Week_14_Attendance__c = TRUE, 1, 0) + +IF (Week_15_Attendance__c = TRUE, 1, 0) + +IF (Week_16_Attendance__c = TRUE, 1, 0) + +IF (Week_17_Attendance__c = TRUE, 1, 0) + +IF (Week_18_Attendance__c = TRUE, 1, 0) + +IF (Week_19_Attendance__c = TRUE, 1, 0) + +IF (Week_20_Attendance__c = TRUE, 1, 0) + +IF (Week_21_Attendance__c = TRUE, 1, 0) + +IF (Week_22_Attendance__c = TRUE, 1, 0) + +IF (Week_23_Attendance__c = TRUE, 1, 0) + +IF (Week_24_Attendance__c = TRUE, 1, 0) + +IF (Week_25_Attendance__c = TRUE, 1, 0) + +IF (Week_26_Attendance__c = TRUE, 1, 0) + +IF (Week_27_Attendance__c = TRUE, 1, 0) + +IF (Week_28_Attendance__c = TRUE, 1, 0) + +IF (Week_29_Attendance__c = TRUE, 1, 0) + +IF (Week_30_Attendance__c = TRUE, 1, 0) + BlankAsZero + + 18 + false + 0 + false + false + Number + false + Parent_Email__c false @@ -540,19 +595,304 @@ TRUE, FALSE ) false Checkbox - - X2016_17_School_Terms - NAME - School__c - Student__c - CREATED_DATE - Everything - - School_Year__c - equals - 2017-2018 - - - en_US - + + Week_10_Attendance__c + false + false + Checked = attended, unchecked = did not attend + + false + false + Checkbox + + + Week_11_Attendance__c + false + false + Checked = attended, unchecked = did not attend + + false + false + Checkbox + + + Week_12_Attendance__c + false + false + Checked = attended, unchecked = did not attend + + false + false + Checkbox + + + Week_13_Attendance__c + false + false + Checked = attended, unchecked = did not attend + + false + false + Checkbox + + + Week_14_Attendance__c + false + false + Checked = attended, unchecked = did not attend + + false + false + Checkbox + + + Week_15_Attendance__c + false + false + Checked = attended, unchecked = did not attend + + false + false + Checkbox + + + Week_16_Attendance__c + false + false + Checked = attended, unchecked = did not attend + + false + false + Checkbox + + + Week_17_Attendance__c + false + false + Checked = attended, unchecked = did not attend + + false + false + Checkbox + + + Week_18_Attendance__c + false + false + Checked = attended, unchecked = did not attend + + false + false + Checkbox + + + Week_19_Attendance__c + false + false + Checked = attended, unchecked = did not attend + + false + false + Checkbox + + + Week_1_Attendance__c + false + false + Checked = attended, unchecked = did not attend + + false + false + Checkbox + + + Week_20_Attendance__c + false + false + Checked = attended, unchecked = did not attend + + false + false + Checkbox + + + Week_21_Attendance__c + false + false + Checked = attended, unchecked = did not attend + + false + false + Checkbox + + + Week_22_Attendance__c + false + false + Checked = attended, unchecked = did not attend + + false + false + Checkbox + + + Week_23_Attendance__c + false + false + Checked = attended, unchecked = did not attend + + false + false + Checkbox + + + Week_24_Attendance__c + false + false + Checked = attended, unchecked = did not attend + + false + false + Checkbox + + + Week_25_Attendance__c + false + false + Checked = attended, unchecked = did not attend + + false + false + Checkbox + + + Week_26_Attendance__c + false + false + Checked = attended, unchecked = did not attend + + false + false + Checkbox + + + Week_27_Attendance__c + false + false + Checked = attended, unchecked = did not attend + + false + false + Checkbox + + + Week_28_Attendance__c + false + false + Checked = attended, unchecked = did not attend + + false + false + Checkbox + + + Week_29_Attendance__c + false + false + Checked = attended, unchecked = did not attend + + false + false + Checkbox + + + Week_2_Attendance__c + false + false + Checked = attended, unchecked = did not attend + + false + false + Checkbox + + + Week_30_Attendance__c + false + false + Checked = attended, unchecked = did not attend + + false + false + Checkbox + + + Week_3_Attendance__c + false + Checked = attended, unchecked = did not attend + false + + false + false + Checkbox + + + Week_4_Attendance__c + false + false + Checked = attended, unchecked = did not attend + + false + false + Checkbox + + + Week_5_Attendance__c + false + false + Checked = attended, unchecked = did not attend + + false + false + Checkbox + + + Week_6_Attendance__c + false + false + Checked = attended, unchecked = did not attend + + false + false + Checkbox + + + Week_7_Attendance__c + false + false + Checked = attended, unchecked = did not attend + + false + false + Checkbox + + + Week_8_Attendance__c + false + false + Checked = attended, unchecked = did not attend + + false + false + Checkbox + + + Week_9_Attendance__c + false + false + Checked = attended, unchecked = did not attend + + false + false + Checkbox + diff --git a/src/package.xml b/src/package.xml index 2df8830..032a588 100644 --- a/src/package.xml +++ b/src/package.xml @@ -1,5 +1,6 @@ + RegSite_redux C501_CTRL_ClassReg_CreateAcct C501_CTRL_ClassReg_Home @@ -23,10 +24,11 @@ Account.C501_Class_Site_Mobile_Number__c Account.C501_Is_Active_School__c Account.C501_Next_program_start_date__c - Account.Primary_Teacher__c Account.Region__c - Account.Secondary_Teacher__c - Account.Teachers_at_Site__c + Account.School_District_Lookup__c + Activity.Action__c + Activity.Activity_Report_Type__c + Activity.Point_Person__c Class_Site_Login_Attempt__c.Account__c Class_Site_Login_Attempt__c.Code_Sent_To__c Class_Site_Login_Attempt__c.Login_Attempts__c @@ -52,25 +54,17 @@ Contact.Emergency_Contact_2_Relationship__c Contact.Emergency_Preferred_Medical_Provider__c Contact.Family_Status__c + Contact.Graduation_Year__c Contact.Income__c Contact.Medication__c - Contact.Number_in_Household_Picklist__c - Contact.Number_in_Household__c - Contact.Parent_Education__c - Contact.Parent_Education__c - Contact.Parent_Education_second_parent__c - Contact.Parent_Education_second_parent__c - Contact.Parent_Workplace__c - Contact.Preferred_Method_of_Contact__c - Contact.Race__c Contact.Student_Special_Needs__c Contact.Student_Transportation__c - Contact.T_shirt_Size__c Contact.Translation_Needed_Other__c Contact.Translation_Needed__c - Contact.Volunteer__c + RegistrationSiteSettings__c.Default_From_Email__c School_Term__c.Active_Year__c School_Term__c.Authorization_to_treat_minor__c + School_Term__c.C501_Form_Completion_Language__c School_Term__c.C501_Free_Reduced_Lunch_Picklist__c School_Term__c.C501_Sign_Up_Source__c School_Term__c.Contract__c @@ -83,6 +77,7 @@ School_Term__c.Left_Program_Early__c School_Term__c.Media_Release__c School_Term__c.Notes__c + School_Term__c.Number_of_Weeks_Attended__c School_Term__c.Parent_Email__c School_Term__c.Parent_Initials__c School_Term__c.Parent_Packet_URL_Unsigned__c @@ -101,10 +96,36 @@ School_Term__c.Student_School_ID__c School_Term__c.Student__c School_Term__c.Waiver__c - TwilioConfig__c.AccountSid__c - TwilioConfig__c.ApplicationSid__c - TwilioConfig__c.AuthToken__c - TwilioConfig__c.Default_Send_Number__c + School_Term__c.Week_10_Attendance__c + School_Term__c.Week_11_Attendance__c + School_Term__c.Week_12_Attendance__c + School_Term__c.Week_13_Attendance__c + School_Term__c.Week_14_Attendance__c + School_Term__c.Week_15_Attendance__c + School_Term__c.Week_16_Attendance__c + School_Term__c.Week_17_Attendance__c + School_Term__c.Week_18_Attendance__c + School_Term__c.Week_19_Attendance__c + School_Term__c.Week_1_Attendance__c + School_Term__c.Week_20_Attendance__c + School_Term__c.Week_21_Attendance__c + School_Term__c.Week_22_Attendance__c + School_Term__c.Week_23_Attendance__c + School_Term__c.Week_24_Attendance__c + School_Term__c.Week_25_Attendance__c + School_Term__c.Week_26_Attendance__c + School_Term__c.Week_27_Attendance__c + School_Term__c.Week_28_Attendance__c + School_Term__c.Week_29_Attendance__c + School_Term__c.Week_2_Attendance__c + School_Term__c.Week_30_Attendance__c + School_Term__c.Week_3_Attendance__c + School_Term__c.Week_4_Attendance__c + School_Term__c.Week_5_Attendance__c + School_Term__c.Week_6_Attendance__c + School_Term__c.Week_7_Attendance__c + School_Term__c.Week_8_Attendance__c + School_Term__c.Week_9_Attendance__c CustomField @@ -119,7 +140,6 @@ C501_ClassReg_Birthday C501_ClassReg_ChildMobilePhone C501_ClassReg_ChildSchoolName - C501_ClassReg_ChildSchoolName C501_ClassReg_ChildSchoolRegion C501_ClassReg_CodeMessage C501_ClassReg_CodeMessageDisclaim @@ -145,11 +165,8 @@ C501_ClassReg_PARTICIPANT_WAIVERp2 C501_ClassReg_PARTICIPANT_WAIVERp3 C501_ClassReg_ParentHomePhone - C501_ClassReg_ParentHomePhone - C501_ClassReg_ParentMobilePhone C501_ClassReg_ParentMobilePhone C501_ClassReg_ParentWorkPhone - C501_ClassReg_ParentWorkPhone C501_ClassReg_PhoneFail C501_ClassReg_PhoneFailSpecific C501_ClassReg_PhotoVideo @@ -158,8 +175,6 @@ C501_ClassReg_PickUpChild C501_ClassReg_PlzSelectOne C501_ClassReg_StudentID - C501_ClassReg_StudentID - C501_ClassReg_SubmitApplication C501_ClassReg_SubmitApplication C501_ClassReg_WaiverRequired C501_ClassReg_dcArea @@ -168,6 +183,7 @@ C501_ClassReg_seattleArea C501_ClassReg_southBay C501_Classreg_CheckBoxes + C501_RegSite_California C501_RegSite_ChildCanDoSurvey C501_RegSite_ChildCanDoSurveyFalse C501_RegSite_ChildCanDoSurveyTrue @@ -186,6 +202,7 @@ C501_RegSite_EmailConfirmP4 C501_RegSite_EmergencyContacts C501_RegSite_FamilyInformation + C501_RegSite_Family_Status_c C501_RegSite_FinishedApp C501_RegSite_FirstName C501_RegSite_Grade @@ -208,8 +225,10 @@ C501_RegSite_PickUpChildError C501_RegSite_PlzAreaCode C501_RegSite_PlzFillItAllOut + C501_RegSite_Preferred_Method_of_Contact_c C501_RegSite_ProvidePhoneEmail C501_RegSite_ProvideStudentId + C501_RegSite_Race_c C501_RegSite_RememberMeDevice C501_RegSite_SMSweSentAnEmail C501_RegSite_SelectGrade @@ -220,15 +239,20 @@ C501_RegSite_StreetAddress C501_RegSite_StudentInformation C501_RegSite_Transport + C501_RegSite_TreatRequired + C501_RegSite_Volunteer_c C501_RegSite_WeSentYouCode C501_RegSite_Youarenotauthenticated C501_RegSite_ZipCode CustomLabel + + CustomLabels + CustomLabels + Class_Site_Login_Attempt__c RegistrationSiteSettings__c - TwilioConfig__c CustomObject @@ -242,14 +266,8 @@ Contact.C501_Class_Registration_Site_Parent FieldSet - - Class_Site_Login_Attempt__c-Class Site Login Attempt Layout - School_Term__c-School Term Layout - Layout - Class_Site_Login_Attempt__c.All - School_Term__c.X2016_17_School_Terms ListView diff --git a/src/pages/C501_ClassReg_CreateAcct.page b/src/pages/C501_ClassReg_CreateAcct.page index 95d2f80..5570323 100644 --- a/src/pages/C501_ClassReg_CreateAcct.page +++ b/src/pages/C501_ClassReg_CreateAcct.page @@ -482,6 +482,12 @@ + + +

+ +

+ @@ -642,6 +648,23 @@ + + + +

+ +

+ + +

+ +

+ + +

+ +

+
@@ -693,14 +716,21 @@
+

- - + + + +

+ Error: {! $Label.C501_RegSite_TreatRequired } +
+

+
diff --git a/src/pages/C501_ClassReg_CreateAcct.page-meta.xml b/src/pages/C501_ClassReg_CreateAcct.page-meta.xml index 5ce0f1d..53149d1 100644 --- a/src/pages/C501_ClassReg_CreateAcct.page-meta.xml +++ b/src/pages/C501_ClassReg_CreateAcct.page-meta.xml @@ -1,6 +1,6 @@ - 46.0 + 45.0 false false diff --git a/src/permissionsets/C501_Registration_Site_User.permissionset b/src/permissionsets/C501_Registration_Site_User.permissionset index cef3669..eb5c0a4 100644 --- a/src/permissionsets/C501_Registration_Site_User.permissionset +++ b/src/permissionsets/C501_Registration_Site_User.permissionset @@ -20,11 +20,6 @@ Account.C501_Next_program_start_date__c true - - false - Account.Primary_Teacher__c - false - false Account.Region__c @@ -32,12 +27,7 @@ false - Account.Secondary_Teacher__c - false - - - false - Account.Teachers_at_Site__c + Account.School_District_Lookup__c false @@ -165,6 +155,11 @@ Contact.Family_Status__c false + + false + Contact.Graduation_Year__c + false + true Contact.Income__c @@ -180,11 +175,6 @@ Contact.Number_in_Household_Picklist__c true - - false - Contact.Number_in_Household__c - false - true Contact.Parent_Education__c @@ -195,11 +185,6 @@ Contact.Parent_Education_second_parent__c true - - false - Contact.Parent_Workplace__c - false - true Contact.Preferred_Method_of_Contact__c @@ -242,7 +227,17 @@ false - Contact.Volunteer__c + Event.Action__c + false + + + false + Event.Activity_Report_Type__c + false + + + false + Event.Point_Person__c false @@ -255,6 +250,11 @@ School_Term__c.Authorization_to_treat_minor__c true + + false + School_Term__c.C501_Form_Completion_Language__c + false + true School_Term__c.C501_Free_Reduced_Lunch_Picklist__c @@ -315,6 +315,11 @@ School_Term__c.Notes__c true + + false + School_Term__c.Number_of_Weeks_Attended__c + false + false School_Term__c.Parent_Email__c @@ -395,6 +400,171 @@ School_Term__c.Waiver__c true + + false + School_Term__c.Week_10_Attendance__c + false + + + false + School_Term__c.Week_11_Attendance__c + false + + + false + School_Term__c.Week_12_Attendance__c + false + + + false + School_Term__c.Week_13_Attendance__c + false + + + false + School_Term__c.Week_14_Attendance__c + false + + + false + School_Term__c.Week_15_Attendance__c + false + + + false + School_Term__c.Week_16_Attendance__c + false + + + false + School_Term__c.Week_17_Attendance__c + false + + + false + School_Term__c.Week_18_Attendance__c + false + + + false + School_Term__c.Week_19_Attendance__c + false + + + false + School_Term__c.Week_1_Attendance__c + false + + + false + School_Term__c.Week_20_Attendance__c + false + + + false + School_Term__c.Week_21_Attendance__c + false + + + false + School_Term__c.Week_22_Attendance__c + false + + + false + School_Term__c.Week_23_Attendance__c + false + + + false + School_Term__c.Week_24_Attendance__c + false + + + false + School_Term__c.Week_25_Attendance__c + false + + + false + School_Term__c.Week_26_Attendance__c + false + + + false + School_Term__c.Week_27_Attendance__c + false + + + false + School_Term__c.Week_28_Attendance__c + false + + + false + School_Term__c.Week_29_Attendance__c + false + + + false + School_Term__c.Week_2_Attendance__c + false + + + false + School_Term__c.Week_30_Attendance__c + false + + + false + School_Term__c.Week_3_Attendance__c + false + + + false + School_Term__c.Week_4_Attendance__c + false + + + false + School_Term__c.Week_5_Attendance__c + false + + + false + School_Term__c.Week_6_Attendance__c + false + + + false + School_Term__c.Week_7_Attendance__c + false + + + false + School_Term__c.Week_8_Attendance__c + false + + + false + School_Term__c.Week_9_Attendance__c + false + + + false + Task.Action__c + false + + + false + Task.Activity_Report_Type__c + false + + + false + Task.Point_Person__c + false + false Salesforce From c50777b29f87985228976065e922615c96e5afe1 Mon Sep 17 00:00:00 2001 From: jonsayer Date: Mon, 21 Oct 2019 09:36:29 -0700 Subject: [PATCH 4/5] Update settings.json --- .vscode/settings.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 39f71a1..f53842b 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,3 @@ { - "eslint.nodePath": "c:\\Users\\Jon\\.vscode\\extensions\\salesforce.salesforcedx-vscode-lwc-46.16.0\\node_modules" -} \ No newline at end of file + "eslint.nodePath": "c:\\Users\\DaveB\\.vscode\\extensions\\salesforce.salesforcedx-vscode-lwc-46.1.0\\node_modules" +} From c51880cf536cc5527e933dc5fb2d68502617ca1a Mon Sep 17 00:00:00 2001 From: jonsayer Date: Tue, 21 Jan 2020 18:35:18 -0800 Subject: [PATCH 5/5] Update C501_CTRL_ClassReg_Login.cls change to this file fixes a bug when someone tries to log in with a phone number with parenthesis and whatnot in the number eg. (800) 555-5555. Would previously only work as 8005555555 --- src/classes/C501_CTRL_ClassReg_Login.cls | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/classes/C501_CTRL_ClassReg_Login.cls b/src/classes/C501_CTRL_ClassReg_Login.cls index 153f94a..366581e 100644 --- a/src/classes/C501_CTRL_ClassReg_Login.cls +++ b/src/classes/C501_CTRL_ClassReg_Login.cls @@ -31,7 +31,7 @@ public class C501_CTRL_ClassReg_Login { } public PageReference sendCodeWOacct(){ - String identityInput = C501_UTIL_ClassRegUtilities.cleanInputGeneric(identityInput); + identityInput = C501_UTIL_ClassRegUtilities.cleanInputGeneric(identityInput); if(identityInput == null){ pageStatus = 'lookup-fail'; return null; @@ -82,4 +82,4 @@ public class C501_CTRL_ClassReg_Login { } } -} \ No newline at end of file +}