Skip to content

Commit

Permalink
Events checkin page improvemtnes (#2070)
Browse files Browse the repository at this point in the history
* Events checkin page improvemtnes

1. Ajax Search for Person  (child and Adult)
2. Verification extra steps removed. Now as you type..
3. Datatable included image
4. Event selection change automatically reloads page
5. Delete action added
6. remove Check out  after checked out.
7. Form validator JS introduced
8. added jquery-ui.css to fix the ajax dropbox background issue.

fixes #2066

* GetAddress for Person

* Add function getFormattedName

Add getFormattedName($Style) to Person Class

Styles
* $Style = 0  :  "Title FirstName MiddleName LastName, Suffix"
* $Style = 1  :  "Title FirstName MiddleInitial. LastName, Suffix"
* $Style = 2  :  "LastName, Title FirstName MiddleName, Suffix"
* $Style = 3  :  "LastName, Title FirstName MiddleInitial., Suffix"
* $Style = 4  :  "FirstName MiddleName LastName"
* $Style = 5  :  "Title FirstName LastName"
* $Style = 6  :  "LastName, Title FirstName"

* Add Primary Key to event_Attend Table

Add Primary Key to event_Attend Table. Without Primary Key PRopel
queries not working properly.

* Converting Queries to ORM

Queries to ORM

* Move Person Name Style to SystemConfig

Move Person Name Style to SystemConfig::getValue('iPersonNameStyle')

* Change paerson.getFullName function

Change paerson.getFullName function to use the system setting to get the
name format

* Review Changes

1. Bootstrap validator via npm/grunt
2. change memebr to "part" if no role set.

* PR review changes and then some

PR Review Changes
* Copy Jquery ui css via grunt
* gitignore src/skin/jquery-ui
* Remove space from the upgrade sql filename

Other Changes
* Remove perArr.title as it is included in the displayName
* Check if peson has a family, before calling family->get address
  • Loading branch information
simonkp authored and DawoudIO committed Mar 19, 2017
1 parent e613ecc commit 04b7273
Show file tree
Hide file tree
Showing 13 changed files with 568 additions and 559 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ src/skin/jquery-photo-uploader
src/skin/randomcolor
src/skin/bootbox
src/skin/bootstrap-toggle
src/skin/bootstrap-validator
src/skin/jquery-ui

# Configuration files with passwords
src/Include/Config.php
Expand Down
11 changes: 11 additions & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,13 @@ module.exports = function (grunt) {
flatten: true,
src: ['node_modules/bootstrap-toggle/css/bootstrap-toggle.css', 'node_modules/bootstrap-toggle/js/bootstrap-toggle.js'],
dest: 'src/skin/bootstrap-toggle/'
},
{
expand: true,
filter: 'isFile',
flatten: true,
src: ['node_modules/bootstrap-validator/dist/validator.min.js'],
dest: 'src/skin/bootstrap-validator/'
}
]
}
Expand Down Expand Up @@ -218,6 +225,10 @@ module.exports = function (grunt) {
fastclick: {
src: ['https://raw.githubusercontent.com/ftlabs/fastclick/569732a7aa5861d428731b8db022b2d55abe1a5a/lib/fastclick.js'],
dest: 'src/skin/fastclick'
},
jqueryuicss: {
src: ['https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css'],
dest: 'src/skin/jquery-ui/'
}
},
sass: {
Expand Down
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@
"fullcalendar": "3.0.1",
"jquery-photo-uploader": "1.0.11",
"initial-js": "0.3.4",
"bootstrap-toggle": "2.2.2"
"bootstrap-toggle": "2.2.2",
"bootstrap-validator": "0.11.9"

},
"scripts": {
"install": "grunt clean && grunt updateVersions && grunt curl-dir && grunt copy && grunt sass",
Expand Down
1 change: 1 addition & 0 deletions propel/schema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -455,6 +455,7 @@
</vendor>
</table>
<table name="event_attend" idMethod="native" phpName="EventAttend">
<column name="attend_id" phpName="AttendId" type="INTEGER" primaryKey="true" autoIncrement="true" required="true"/>
<column name="event_id" phpName="EventId" type="INTEGER" required="true" defaultValue="0"/>
<column name="person_id" phpName="PersonId" type="INTEGER" required="true" defaultValue="0"/>
<column name="checkin_date" phpName="CheckinDate" type="TIMESTAMP"/>
Expand Down
Loading

0 comments on commit 04b7273

Please sign in to comment.