Skip to content

Commit

Permalink
Fixes #173
Browse files Browse the repository at this point in the history
Grievance Report Page
  • Loading branch information
ddbruce authored Aug 12, 2024
2 parents d4cd2c1 + dcaf33f commit 7ee28d9
Show file tree
Hide file tree
Showing 9 changed files with 67 additions and 14 deletions.
Binary file added img/5939-2024.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,7 @@ <h3>Other Agencies</h3>
<script src="js/controllers/MemberListCtrl.js"></script>
<script src="js/controllers/404Ctrl.js"></script>
<script src="js/controllers/EditEventCtrl.js"></script>
<script src="js/controllers/GrievanceFormCtrl.js"></script>

<!-- <script src="js/snowstorm.js"></script> -->
</body>
Expand Down
4 changes: 2 additions & 2 deletions js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ var dependencies = [
'CoverageDetailsCtrl', 'JoinCtrl', 'NightCrewsCtrl', 'MemberListCtrl', 'FuelLogCtrl', 'StockingIssueCtrl',
'AddMemberCtrl', 'ExpirationsCtrl', 'CommunityCtrl', 'EditMemberCtrl', 'GamesEventsCtrl', 'AddEventCtrl', 'EditDefaultCtrl',
'EventCtrl', 'GameCtrl', 'GamesEventsCtrl', 'ModifyScheduleCtrl', 'MySettingsCtrl', 'MyTrainingCtrl', 'AnnouncementsCtrl',
'NominationsCtrl', 'FuelLogCtrl', '404Ctrl', 'EditEventCtrl'
'NominationsCtrl', 'FuelLogCtrl', '404Ctrl', 'EditEventCtrl', 'GrievanceFormCtrl'
];

var app = angular.module('RPIA', dependencies);
Expand All @@ -41,7 +41,7 @@ app.run(['$rootScope', '$location', 'AuthService', function ($rootScope, $locati
'attendant-training', 'driver-training', 'crew-chief-training', 'supervisor-training', 'in-service-training',
'communications', 'emt-reciprocity', 'minutes', 'misc-forms', 'mutual-aid', 'misc-forms', 'radio-callsigns',
'rensco-resources', 'sog', 'doh-resources', 'text-message-dispatch', 'my-settings', 'my-training', 'logout',
'games-events', 'constitution', 'bylaws', 'event', 'game'
'games-events', 'constitution', 'bylaws', 'event', 'game', 'grievance-form'
];

var SCHEDULING_PAGES = [
Expand Down
2 changes: 1 addition & 1 deletion js/appRoutes.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ angular.module('appRoutes', []).config(['$routeProvider', '$locationProvider', f
'SOG', 'Supervisor-Training', 'System-Requirements', 'Text-Message-Dispatch', 'Coverage-Details',
'Join', 'Night-Crews', 'Member-List', 'Stocking-Issue', 'Fuel-Log', 'Add-Member', 'Expirations', 'Community',
'Edit-Member', 'Games-Events', 'Add-Event', 'Edit-Default', 'Event', 'Game', 'Modify-Schedule', /*'My-Training',*/
'My-Settings', /*'Announcements',*/ 'Nominations', 'Fuel-Log', '404', 'edit-event'
'My-Settings', /*'Announcements',*/ 'Nominations', 'Fuel-Log', '404', 'edit-event', 'Grievance-Form'
];

views.forEach(function (elem, index) {
Expand Down
19 changes: 10 additions & 9 deletions js/controllers/5939AboutCtrl.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,24 @@ angular.module('5939AboutCtrl', []).controller('5939AboutCtrl', ['$scope', funct
{
header: '',
internal_title: 'About Text',
body: 'RPI Ambulance operates a 2006 AEV Trauma Hawk XL Type II ambulance mounted on a Ford E-350 ' +
'chassis. This vehicle was placed in service in the Spring of 2007. The county vehicle identifier is ' +
'5939, however the ambulance was formerly known as A-39 and continues to hold this call sign within the ' +
'agency. 5939 is the fifth van ambulance operated by RPI Ambulance. The first was placed in service in 1983.'
body: 'RPI Ambulance operates a 2024 AEV Trauma Hawk Type III ambulance mounted on a Ford E-350 ' +
'chassis. This vehicle was placed in service in August of 2024. The county vehicle identifier is ' +
'5939. 5939 is the second box ambulance operated by RPI Ambulance, with the last being from the mid 1980s.'
},
{
header: '5939 in October 2015',
internal_title: '5939 in October 2015',
header: '5939 in August 2024',
internal_title: '5939 in August 2024',
type: 'img',
img: 'img/5939-2015.jpg',
img: 'img/5939-2024.jpg',
width: '75%',
alt: '5939 In front of EMPAC',
alt: '5939 in front of the Mueller Center',
centered: true
},
{
header: 'Past Ambulances',
body: 'In Spring 2007, 5939 was delivered to replace the aging A-39. A-39 had proudly served the agency ' +
body: 'In the summer of 2024, a new 5939 was delivered to replace the aging 5939, which had served the agency for ' +
'17 years since its delivery in 2007. It replaced ambulance A-39, its predecessor which was also a type II van ' +
'style ambulance. A-39 had proudly served the agency ' +
'for 10 years before being retired. The agency has also operated several other ambulances, the first of ' +
'which is rumored to have been given to RPI Ambulance when members saved a member of the faculty from ' +
'choking in one of the dining halls.'
Expand Down
16 changes: 16 additions & 0 deletions js/controllers/GrievanceFormCtrl.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
angular.module('GrievanceFormCtrl', []).controller('GrievanceFormCtrl', ['$scope', function($scope) {
$scope.pageHeader = 'RPI Ambulance Grievance Report Form';
$scope.sections = [
{
header: 'Grievance Committee',
internal_title: 'Grievance Committee',
body: 'The Grievance Committee at RPIA aims to address interpersonal conflicts that may occur within the club, defuse intra-agency tensions, and ensure that the SOGs and constitution are followed by all members. We stand as unbiased members of the club and hope that you’ll feel comfortable sharing any issues or concerns with us. We will work to the best of our abilities so that RPI Ambulance can be a great experience for all members. In many cases, a problem can be easily resolved by talking with each other. However, if you do not feel comfortable addressing the person(s) directly, please place your response through our Google Form below so that we can help mediate a session with the other individual(s). There are many options in terms of level of anonymity, but all meetings and interactions related to your case will be held in a closed environment. Do not hesitate to contact us at [email protected] for more information.\n'
},

{
header: 'Report Form',
body: '<div class="embed-responsive embed-responsive-16by9"> ' +
'<iframe src="https://docs.google.com/forms/d/e/1FAIpQLSfP8JH9vpKtFNeaz0gxF7IbcgVNj-zw8AxyZMjg0-QioX0QKA/viewform?embedded=true" width="640" height="2031" frameborder="0" marginheight="0" marginwidth="0">Loading…</iframe>'
}
];
}]);
1 change: 1 addition & 0 deletions js/controllers/MainCtrl.js
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ angular.module('MainCtrl', []).controller('MainCtrl', ['$rootScope', '$scope', '
page: '', title: 'Tools', isDropdown: true, dividersAfter: [], dropdownOptions: [
{page: 'member-list', title: 'Member List'},
{page: 'fuel-log', title: 'Fuel Log'},
{page: 'grievance-form', title: 'Grievance Report'},
{page: 'stocking-issue', title: 'Stocking'},
// {page: 'announcements', title: 'Announcements'}
]
Expand Down
30 changes: 28 additions & 2 deletions js/controllers/OfficersCtrl.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ angular.module('OfficersCtrl', []).controller('OfficersCtrl', ['$scope', '$sce',
type: 'img',
img: 'img/O-Board.jpg',
width: '75%',
alt: 'Photo of the office board',
alt: 'Photo of the officer board',
centered: true
},

Expand All @@ -27,11 +27,37 @@ angular.module('OfficersCtrl', []).controller('OfficersCtrl', ['$scope', '$sce',
internal_title: 'Current Officer Board',
body: 'Line Side: \n' +
'* Captain: Jacob Steingart \n' +
'* First Lieutenant: Christian Kegel \n' +
'* Second Lieutenant: Toby McDonald \n' +
'\nCivil Side:\n' +
'* President: Alex Mattoni \n' +
'* Vice President: Dylan Deren'
},

{
header: 'Officer Board Spring 2024',
internal_title: 'Past Officer Boards',
body: 'Line Side: \n' +
'* Captain: Jacob Steingart\n' +
'* First Lieutenant: Thomas Celuzza \n' +
'* Second Lieutenant: Christian Kegel \n' +
'\nCivil Side:\n' +
'* President: Alex Mattoni\n' +
'* Vice President: Dylan Deren'

},

{
header: 'Officer Board Fall 2023',
internal_title: 'Past Officer Boards',
body: 'Line Side: \n' +
'* Captain: Jacob Steingart\n' +
'* First Lieutenant: Thomas Celuzza \n' +
'* Second Lieutenant: Sean Lim \n' +
'\nCivil Side:\n' +
'* President: Felicia Walbridge \n' +
'* President: Felicia Walbridge\n' +
'* Vice President: Alex Mattoni'

},

{
Expand Down
8 changes: 8 additions & 0 deletions views/grievance-form.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<section id="grievance-form">
<div class="container">
<div class="center">
<page-content ng-hide="editMode"></page-content>
<edit-content ng-show="editMode"></edit-content>
</div>
</div>
</section>

0 comments on commit 7ee28d9

Please sign in to comment.