Skip to content

Commit

Permalink
Merge pull request #922 from rajavocette/ITA_To_SkilledTradesBC_V2
Browse files Browse the repository at this point in the history
Label changed from ITA To SkilledTradesBC
  • Loading branch information
josekudiyirippil authored Jun 12, 2024
2 parents 044ed6d + 5901531 commit 50efa08
Show file tree
Hide file tree
Showing 8 changed files with 483 additions and 817 deletions.
4 changes: 2 additions & 2 deletions api/app/admin/csr.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def can_create(self):
'office_manager': 'Office Exam Manager',
'pesticide_designate': 'Environment Client Liaison/Program Specialist',
'finance_designate': 'Financial Reporting Designate',
'ita2_designate': 'ITA Liaison/Program Specialist',
'ita2_designate': 'SkilledTradesBC Liaison/Program Specialist',
role_desc_const: 'Role',
'deleted': 'Deleted'
}
Expand Down Expand Up @@ -81,7 +81,7 @@ def can_create(self):
("0", 'No - not in Finance team'), ("1", 'Yes - for Finance team reporting')
],
'ita2_designate': [
("0", 'No - not an ITA Liaison'), ("1", 'Yes - an ITA Liaison')
("0", 'No - not a SkilledTradesBC Liaison'), ("1", 'Yes - a SkilledTradesBC Liaison')
]
}

Expand Down
6 changes: 3 additions & 3 deletions api/app/admin/examtype.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def get_query(self):
'number_of_hours': 'Number of Hours',
'number_of_minutes': 'Number of Minutes',
'method_type': 'Method Type',
'ita_ind': 'ITA Exam Flag',
'ita_ind': 'SkilledTradesBC Exam Flag',
'group_exam_ind': 'Group Exam Flag',
'pesticide_exam_ind': 'Environment Exam Flag',
'deleted': 'Deleted',
Expand Down Expand Up @@ -79,14 +79,14 @@ def get_query(self):
'number_of_hours': 'Number of Hours',
'number_of_minutes': 'Number of Minutes',
'method_type': 'Method Type',
'ita_ind': 'ITA Exam Flag',
'ita_ind': 'SkilledTradesBC Exam Flag',
'group_exam_ind': 'Group Exam Flag',
'pesticide_exam_ind': 'Environment Exam Flag',
'deleted': 'Deleted',
}
form_choices = {
'ita_ind': [
("0", 'No - this is not an ITA exam'), ("1", 'Yes - this is an ITA exam')
("0", 'No - this is not a SkilledTradesBC exam'), ("1", 'Yes - this is a SkilledTradesBC exam')
],
'group_exam_ind': [
("0", 'No - this is not a Group exam'), ("1", 'Yes - this is a Group exam')
Expand Down
2 changes: 1 addition & 1 deletion appointment-frontend/cypress/support/commands.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ declare global {
//
Cypress.Commands.add('bceidLogin', (url, username, password) => {
cy.task('bceidLogin', { url: url, username: username, password: password },
{ timeout: 60000 }).then(sessionItems => {
{ timeout: 120000 }).then(sessionItems => {
Object.keys(sessionItems).forEach(key => {
sessionStorage.setItem(key, sessionItems[key])
})
Expand Down
Loading

0 comments on commit 50efa08

Please sign in to comment.