[scu-smp] r267 committed - Complete - issue 41: Refactor student table (remove account_status col...

0 views
Skip to first unread message

scu...@googlecode.com

unread,
Oct 2, 2010, 12:19:43 AM10/2/10
to scu...@googlegroups.com
Revision: 267
Author: sid.moradi
Date: Fri Oct 1 21:19:05 2010
Log: Complete - issue 41: Refactor student table (remove account_status
column)
http://code.google.com/p/scu-smp/issues/detail?id=41

http://code.google.com/p/scu-smp/source/detail?r=267

Added:
/trunk/smp-php/static/css/table.css
Modified:
/trunk/smp-php/db.sql
/trunk/smp-php/smp/domain/Student.php
/trunk/smp-php/smp/mapper/StudentMapper.php
/trunk/smp-php/smp/service/StudentService.php
/trunk/smp-php/smp/util/DatagridUtil.php
/trunk/smp-php/smp/view/common/footer.php
/trunk/smp-php/smp/view/log/list.php
/trunk/smp-php/static/css/site.css
/trunk/smp-php/static/css/theme.css

=======================================
--- /dev/null
+++ /trunk/smp-php/static/css/table.css Fri Oct 1 21:19:05 2010
@@ -0,0 +1,112 @@
+/* TABLE */
+table {
+ font-size: 1em;
+ margin: 0 0 1.5em 0;
+ padding: 0;
+}
+
+table caption {
+ font-weight: bold;
+ margin: 0 0 0 0;
+ padding: 0 0 1.5em 0;
+}
+
+th {
+ font-weight: bold;
+ text-align: left;
+}
+
+td {
+ font-size: 1em;
+}
+
+/*********************************
+ Project: CSS Table Galery
+ Title: Like Adwords
+ Author: Cleiton Francisco
+ URL: http://www.cleiton.net/
+ Country: Brazil
+ Update: 2005-12-18
+ *******************************/
+.table {
+ border-collapse: collapse;
+ border: 2px solid #74b3dc;
+ color: #000;
+ background: #fff;
+ width: 100%;
+ }
+.table caption {
+ padding: 0 0.6em 0.8em;
+ font-size: 1.3em;
+ font-weight: bold;
+ text-align: left;
+ color: #000;
+ background: transparent;
+ }
+/* For Tapestry's contribTable */
+.table th table, .table th table td {
+ width: 100%;
+ border: 0px;
+ }
+.contribTable th {
+ padding: 0px !important;
+ background: #d7e9f5;
+ }
+.contribTable th .tableHeaderTable {
+ margin: 0px !important;
+ }
+.table td, .table th, .tableHeaderTable td {
+ border: 1px solid silver;
+ padding: 0.5em;
+ }
+.table th {
+ background-color: #d7e9f5;
+ }
+.table thead th, .tableHeaderTable td {
+ border: 1px solid #e0e0e0;
+ text-align: left;
+ font-size: 1em;
+ font-weight: bold;
+ background: #d7e9f5;
+ }
+.tableHeaderTable td a {
+ text-decoration: none !important;
+ }
+.table tfoot th, tfoot td {
+ border: 1px solid #e0e0e0;
+ text-align: left;
+ font-size: 1em;
+ background: #e8e8cf;
+ }
+.table tfoot th {
+ font-weight: bold;
+ }
+.table tbody td a {
+ background: transparent;
+ text-decoration: underline;
+ }
+.table tbody td a:hover {
+ background: transparent;
+ text-decoration: underline;
+ }
+.table tbody th a {
+ background: transparent;
+ text-decoration: underline;
+ font-weight: bold;
+ }
+.table tbody th, .table tbody td {
+ text-align: left;
+ }
+.table tfoot td {
+ border: 1px solid #996;
+ }
+.table tbody tr:hover, .table tr.over, .contribTable tr:hover {
+ background: #ffffd9 !important; /* important needed for Tapestry, as
is .table tr:hover */
+ }
+.contribTable tr.even {
+ background: #fff !important;
+ }
+.contribTable tr.odd {
+ background: #eee !important;
+ }
+/* END TABLE */
=======================================
--- /trunk/smp-php/db.sql Fri Oct 1 01:30:37 2010
+++ /trunk/smp-php/db.sql Fri Oct 1 21:19:05 2010
@@ -283,34 +283,34 @@


insert into smp_student (id, user_id, firstname, lastname, gender,
student_number, age_range, course_id, major, study_mode,
recommended_by_staff, semesters_completed, family_status, work_status,
tertiary_study_status,is_first_year, is_international, is_disability,
-
is_indigenous,is_non_english,is_regional,is_socioeconomic,prefer_gender,prefer_australian,prefer_distance,prefer_international,prefer_on_campus,interests,comments,account_status)
+
is_indigenous,is_non_english,is_regional,is_socioeconomic,prefer_gender,prefer_australian,prefer_distance,prefer_international,prefer_on_campus,interests,comments)
values
- (1, 4 , 'Jiya' , 'Khangura', 'f', '21555555', 'under25',
31, 'Multimedia' , 'coffs', 'Paul Woods', '4', 'no'
, 'parttime', 'no' , 'no' , '1', '0', '0', '1', '0', '0', 'no' , '0', '1', '1', '1', 'Reading', 'No
Commnets left', 'AS_NEW_MENTOR'),
- (2, 5 , 'Lucy' , 'Zhang' , 'f', '21888888', 'under25',
31, 'Software ' , 'coffs', 'Paul Woods', '0', 'no'
, 'parttime', 'no' , 'no' , '0', '0', '0', '1', '1', '0', 'no' , '1', '0', '1', '1', 'Reading', 'No
Commnets left', 'AS_NEW_MENTEE'),
- (3, 7 , 'Bruce' , 'Li' , 'm', '21666666', 'under25',
31, 'Multimedia' , 'coffs', 'Paul Woods', '4', 'no'
, 'parttime', 'no' , 'no' , '1', '0', '0', '1', '0', '0', 'no' , '1', '0', '1', '1', 'Reading', 'No
Commnets left', 'AS_NEW_MENTOR'),
- (4, 6 , 'James' , 'Gleeson' , 'm', '21777777', 'under25',
31, 'Software ' , 'coffs', 'Paul Woods', '1', 'no'
, 'parttime', 'no' , 'no' , '0', '0', '0', '0', '1', '0', 'no' , '0', '1', '1', '1', 'Reading', 'No
Commnets left', 'AS_NEW_MENTEE'),
- (5, 8 , 'Mentor5' , 'Family5' , 'f', '21000005', 'under25', 41, 'Major1'
, 'coffs', 'Paul Woods', '2', 'no'
, 'nowork' , 'no' , 'yes', '0', '1', '0', '1', '0', '1', 'yes', '1', '0', '0', '0', 'Walking', 'I
like chocolate', 'AS_NEW_MENTOR'),
- (6, 9 , 'Mentor6' , 'Family6' , 'm', '21000006', '25to30' , 41, 'Major2'
, 'tweed', 'Staff
num1', '2', 'yes' , 'casual' , 'yes', 'no' , '1', '0', '1', '0', '1', '0', 'no' , '0', '1', '1', '1', 'Walking', 'I
like ice cream', 'AS_NEW_MENTOR'),
- (7, 10, 'Mentor7' , 'Family7' , 'f', '21000007', '30to40' , 41, 'Major1'
, 'coffs', 'Paul Woods', '2', 'no'
, 'nowork' , 'no' , 'yes', '0', '1', '0', '1', '0', '1', 'yes', '1', '0', '0', '0', 'Walking', 'I
like chocolate', 'AS_NEW_MENTOR'),
- (8, 11, 'Mentor8' , 'Family8' , 'm', '21000008', '25to30' , 51, 'Major2'
, 'tweed', 'Staff
num1', '2', 'yes' , 'casual' , 'yes', 'no' , '1', '0', '1', '0', '1', '0', 'no' , '0', '1', '1', '1', 'Walking', 'I
like ice cream', 'AS_NEW_MENTOR'),
- (9, 12, 'Mentor9' , 'Family9' , 'f', '21000009', '30to40' , 51, 'Major1'
, 'coffs', 'Paul Woods', '2', 'no'
, 'nowork' , 'no' , 'yes', '0', '1', '0', '1', '0', '1', 'yes', '1', '0', '0', '0', 'Walking', 'I
like chocolate', 'AS_NEW_MENTOR'),
- (10,13, 'Mentor10' , 'Family10', 'm', '21000010', '25to30' ,
51, 'Major2' , 'tweed', 'Staff
num1', '2', 'yes' , 'casual' , 'yes', 'no' , '1', '0', '1', '0', '1', '0', 'no' , '0', '1', '1', '1', 'Walking', 'I
like ice cream', 'AS_NEW_MENTOR'),
- (11,14, 'Mentee5' , 'Family5' , 'f', '21000011', 'under25', 41, 'Major1'
, 'coffs', 'Paul Woods', '2', 'no'
, 'nowork' , 'no' , 'yes', '0', '1', '0', '1', '0', '1', 'yes', '1', '0', '0', '0', 'Walking', 'I
like chocolate', 'AS_NEW_MENTEE'),
- (12,15, 'Mentee6' , 'Family6' , 'm', '21000012', 'under25', 41, 'Major2'
, 'tweed', 'Staff
num1', '2', 'yes' , 'casual' , 'yes', 'no' , '1', '0', '1', '0', '1', '0', 'no' , '0', '1', '1', '1', 'Walking', 'I
like ice cream', 'AS_NEW_MENTEE'),
- (13,16, 'Mentee7' , 'Family7' , 'f', '21000013', '30to40' , 41, 'Major1'
, 'coffs', 'Paul Woods', '2', 'no'
, 'nowork' , 'no' , 'yes', '0', '1', '0', '1', '0', '1', 'yes', '1', '0', '0', '0', 'Walking', 'I
like chocolate', 'AS_NEW_MENTEE'),
- (14,17, 'Mentee8' , 'Family8' , 'm', '21000014', '25to30' , 51, 'Major2'
, 'tweed', 'Staff
num1', '2', 'yes' , 'casual' , 'yes', 'no' , '1', '0', '1', '0', '1', '0', 'no' , '0', '1', '1', '1', 'Walking', 'I
like ice cream', 'AS_NEW_MENTEE'),
- (15,18, 'Mentee9' , 'Family9' , 'f', '21000015', 'under25', 51, 'Major1'
, 'coffs', 'Paul Woods', '2', 'no'
, 'nowork' , 'no' , 'yes', '0', '1', '0', '1', '0', '1', 'yes', '1', '0', '0', '0', 'Walking', 'I
like chocolate', 'AS_NEW_MENTEE'),
- (16,19, 'Mentee10' , 'Family10', 'm', '21000016', 'under25' ,
51, 'Major2' , 'tweed', 'Staff
num1', '2', 'no' , 'casual' , 'yes', 'no' , '0', '0', '1', '0', '1', '0', 'no' , '0', '1', '1', '1', 'Walking', 'I
like ice cream', 'AS_NEW_MENTEE'),
- (17,20, 'Mentor11' , 'Family11', 'm', '21000017', 'under25', 31, 'Info
Sys' , 'coffs', 'Barry
Wilks','3', 'no' , 'nowork' , 'no' , 'no' , '1', '0', '0', '1', '0', '0', 'no' , '0', '1', '1', '1', 'Running', 'I
like Badminton', 'AS_NEW_MENTOR'),
- (18,21, 'Mentor12' , 'Family12', 'm', '21000018', 'under25',
31, 'Software' , 'coffs', 'Barry
Wilks','2', 'no' , 'nowork' , 'no' , 'no' , '1', '0', '0', '0', '0', '0', 'no' , '0', '1', '1', '1', 'Running', 'I
like Badminton', 'AS_NEW_MENTOR'),
- (19,22, 'Mentor13' , 'Family13', 'f', '21000019', 'under25',
31, 'Multimudia' , 'coffs', 'Barry
Wilks','3', 'no' , 'nowork' , 'no' , 'no' , '1', '0', '0', '1', '0', '0', 'no' , '0', '1', '1', '1', 'Running', 'I
like Badminton', 'AS_NEW_MENTOR'),
- (20,23, 'Mentor14' , 'Family14', 'f', '21000020', 'under25', 31, 'Info
Sys' , 'coffs', 'Barry
Wilks','2', 'no' , 'nowork' , 'no' , 'no' , '1', '0', '0', '0', '0', '0', 'no' , '0', '1', '1', '1', 'Running', 'I
like Badminton', 'AS_NEW_MENTOR'),
- (21,24, 'Mentor15' , 'Family15', 'm', '21000021', 'under25', 41, 'Major
1' , 'tweed', 'Staff
num1', '4', 'no' , 'nowork' , 'no' , 'no' , '1', '0', '0', '1', '0', '0', 'no' , '1', '0', '1', '1', 'Singing', 'I
like pop music', 'AS_NEW_MENTOR'),
- (22,25, 'Mentor16' , 'Family16', 'f', '21000022', 'under25', 41, 'Major
2' , 'tweed', 'Staff
num1', '4', 'no' , 'nowork' , 'no' , 'no' , '1', '0', '0', '0', '0', '0', 'no' , '0', '1', '1', '1', 'Singing', 'I
like pop music', 'AS_NEW_MENTOR'),
- (23,26, 'Mentor17' , 'Family17', 'm', '21000023', 'under25', 41, 'Major
3' , 'tweed', 'Staff
num1', '4', 'no' , 'nowork' , 'no' , 'no' , '1', '0', '0', '1', '0', '0', 'no' , '1', '0', '1', '1', 'Singing', 'I
like pop music', 'AS_NEW_MENTOR'),
- (24,27, 'Mentor18' , 'Family18', 'f', '21000024', 'under25', 51, 'Major
1' , 'coffs', 'Paul
Woods', '5', 'no' , 'nowork' , 'no' , 'no' , '1', '0', '1', '0', '0', '0', 'no' , '0', '1', '1', '1', 'Wiritng', 'I
like read poem', 'AS_NEW_MENTOR'),
- (25,28, 'Mentor19' , 'Family19', 'm', '21000025', 'under25', 51, 'Major
2' , 'coffs', 'Paul
Woods', '5', 'no' , 'nowork' , 'no' , 'no' , '1', '0', '1', '0', '0', '0', 'no' , '0', '0', '1', '1', 'Wiritng', 'I
like read poem', 'AS_NEW_MENTOR'),
- (26,29, 'Mentor20' , 'Family20', 'f', '21000026', 'under25', 51, 'Major
3' , 'coffs', 'Paul
Woods', '5', 'no' , 'nowork' , 'no' , 'no' , '1', '0', '1', '0', '0', '0', 'no' , '0', '1', '1', '1', 'Wiritng', 'I
like read poem', 'AS_NEW_MENTOR');
+ (1, 4 , 'Jiya' , 'Khangura', 'f', '21555555', 'under25',
31, 'Multimedia' , 'coffs', 'Paul Woods', '4', 'no'
, 'parttime', 'no' , 'no' , '1', '0', '0', '1', '0', '0', 'no' , '0', '1', '1', '1', 'Reading', 'No
Commnets left'),
+ (2, 5 , 'Lucy' , 'Zhang' , 'f', '21888888', 'under25',
31, 'Software ' , 'coffs', 'Paul Woods', '0', 'no'
, 'parttime', 'no' , 'no' , '0', '0', '0', '1', '1', '0', 'no' , '1', '0', '1', '1', 'Reading', 'No
Commnets left'),
+ (3, 7 , 'Bruce' , 'Li' , 'm', '21666666', 'under25',
31, 'Multimedia' , 'coffs', 'Paul Woods', '4', 'no'
, 'parttime', 'no' , 'no' , '1', '0', '0', '1', '0', '0', 'no' , '1', '0', '1', '1', 'Reading', 'No
Commnets left'),
+ (4, 6 , 'James' , 'Gleeson' , 'm', '21777777', 'under25',
31, 'Software ' , 'coffs', 'Paul Woods', '1', 'no'
, 'parttime', 'no' , 'no' , '0', '0', '0', '0', '1', '0', 'no' , '0', '1', '1', '1', 'Reading', 'No
Commnets left'),
+ (5, 8 , 'Mentor5' , 'Family5' , 'f', '21000005', 'under25', 41, 'Major1'
, 'coffs', 'Paul Woods', '2', 'no'
, 'nowork' , 'no' , 'yes', '0', '1', '0', '1', '0', '1', 'yes', '1', '0', '0', '0', 'Walking', 'I
like chocolate'),
+ (6, 9 , 'Mentor6' , 'Family6' , 'm', '21000006', '25to30' , 41, 'Major2'
, 'tweed', 'Staff
num1', '2', 'yes' , 'casual' , 'yes', 'no' , '1', '0', '1', '0', '1', '0', 'no' , '0', '1', '1', '1', 'Walking', 'I
like ice cream'),
+ (7, 10, 'Mentor7' , 'Family7' , 'f', '21000007', '30to40' , 41, 'Major1'
, 'coffs', 'Paul Woods', '2', 'no'
, 'nowork' , 'no' , 'yes', '0', '1', '0', '1', '0', '1', 'yes', '1', '0', '0', '0', 'Walking', 'I
like chocolate'),
+ (8, 11, 'Mentor8' , 'Family8' , 'm', '21000008', '25to30' , 51, 'Major2'
, 'tweed', 'Staff
num1', '2', 'yes' , 'casual' , 'yes', 'no' , '1', '0', '1', '0', '1', '0', 'no' , '0', '1', '1', '1', 'Walking', 'I
like ice cream'),
+ (9, 12, 'Mentor9' , 'Family9' , 'f', '21000009', '30to40' , 51, 'Major1'
, 'coffs', 'Paul Woods', '2', 'no'
, 'nowork' , 'no' , 'yes', '0', '1', '0', '1', '0', '1', 'yes', '1', '0', '0', '0', 'Walking', 'I
like chocolate'),
+ (10,13, 'Mentor10' , 'Family10', 'm', '21000010', '25to30' ,
51, 'Major2' , 'tweed', 'Staff
num1', '2', 'yes' , 'casual' , 'yes', 'no' , '1', '0', '1', '0', '1', '0', 'no' , '0', '1', '1', '1', 'Walking', 'I
like ice cream'),
+ (11,14, 'Mentee5' , 'Family5' , 'f', '21000011', 'under25', 41, 'Major1'
, 'coffs', 'Paul Woods', '2', 'no'
, 'nowork' , 'no' , 'yes', '0', '1', '0', '1', '0', '1', 'yes', '1', '0', '0', '0', 'Walking', 'I
like chocolate'),
+ (12,15, 'Mentee6' , 'Family6' , 'm', '21000012', 'under25', 41, 'Major2'
, 'tweed', 'Staff
num1', '2', 'yes' , 'casual' , 'yes', 'no' , '1', '0', '1', '0', '1', '0', 'no' , '0', '1', '1', '1', 'Walking', 'I
like ice cream'),
+ (13,16, 'Mentee7' , 'Family7' , 'f', '21000013', '30to40' , 41, 'Major1'
, 'coffs', 'Paul Woods', '2', 'no'
, 'nowork' , 'no' , 'yes', '0', '1', '0', '1', '0', '1', 'yes', '1', '0', '0', '0', 'Walking', 'I
like chocolate'),
+ (14,17, 'Mentee8' , 'Family8' , 'm', '21000014', '25to30' , 51, 'Major2'
, 'tweed', 'Staff
num1', '2', 'yes' , 'casual' , 'yes', 'no' , '1', '0', '1', '0', '1', '0', 'no' , '0', '1', '1', '1', 'Walking', 'I
like ice cream'),
+ (15,18, 'Mentee9' , 'Family9' , 'f', '21000015', 'under25', 51, 'Major1'
, 'coffs', 'Paul Woods', '2', 'no'
, 'nowork' , 'no' , 'yes', '0', '1', '0', '1', '0', '1', 'yes', '1', '0', '0', '0', 'Walking', 'I
like chocolate'),
+ (16,19, 'Mentee10' , 'Family10', 'm', '21000016', 'under25' ,
51, 'Major2' , 'tweed', 'Staff
num1', '2', 'no' , 'casual' , 'yes', 'no' , '0', '0', '1', '0', '1', '0', 'no' , '0', '1', '1', '1', 'Walking', 'I
like ice cream'),
+ (17,20, 'Mentor11' , 'Family11', 'm', '21000017', 'under25', 31, 'Info
Sys' , 'coffs', 'Barry
Wilks','3', 'no' , 'nowork' , 'no' , 'no' , '1', '0', '0', '1', '0', '0', 'no' , '0', '1', '1', '1', 'Running', 'I
like Badminton'),
+ (18,21, 'Mentor12' , 'Family12', 'm', '21000018', 'under25',
31, 'Software' , 'coffs', 'Barry
Wilks','2', 'no' , 'nowork' , 'no' , 'no' , '1', '0', '0', '0', '0', '0', 'no' , '0', '1', '1', '1', 'Running', 'I
like Badminton'),
+ (19,22, 'Mentor13' , 'Family13', 'f', '21000019', 'under25',
31, 'Multimudia' , 'coffs', 'Barry
Wilks','3', 'no' , 'nowork' , 'no' , 'no' , '1', '0', '0', '1', '0', '0', 'no' , '0', '1', '1', '1', 'Running', 'I
like Badminton'),
+ (20,23, 'Mentor14' , 'Family14', 'f', '21000020', 'under25', 31, 'Info
Sys' , 'coffs', 'Barry
Wilks','2', 'no' , 'nowork' , 'no' , 'no' , '1', '0', '0', '0', '0', '0', 'no' , '0', '1', '1', '1', 'Running', 'I
like Badminton'),
+ (21,24, 'Mentor15' , 'Family15', 'm', '21000021', 'under25', 41, 'Major
1' , 'tweed', 'Staff
num1', '4', 'no' , 'nowork' , 'no' , 'no' , '1', '0', '0', '1', '0', '0', 'no' , '1', '0', '1', '1', 'Singing', 'I
like pop music'),
+ (22,25, 'Mentor16' , 'Family16', 'f', '21000022', 'under25', 41, 'Major
2' , 'tweed', 'Staff
num1', '4', 'no' , 'nowork' , 'no' , 'no' , '1', '0', '0', '0', '0', '0', 'no' , '0', '1', '1', '1', 'Singing', 'I
like pop music'),
+ (23,26, 'Mentor17' , 'Family17', 'm', '21000023', 'under25', 41, 'Major
3' , 'tweed', 'Staff
num1', '4', 'no' , 'nowork' , 'no' , 'no' , '1', '0', '0', '1', '0', '0', 'no' , '1', '0', '1', '1', 'Singing', 'I
like pop music'),
+ (24,27, 'Mentor18' , 'Family18', 'f', '21000024', 'under25', 51, 'Major
1' , 'coffs', 'Paul
Woods', '5', 'no' , 'nowork' , 'no' , 'no' , '1', '0', '1', '0', '0', '0', 'no' , '0', '1', '1', '1', 'Wiritng', 'I
like read poem'),
+ (25,28, 'Mentor19' , 'Family19', 'm', '21000025', 'under25', 51, 'Major
2' , 'coffs', 'Paul
Woods', '5', 'no' , 'nowork' , 'no' , 'no' , '1', '0', '1', '0', '0', '0', 'no' , '0', '0', '1', '1', 'Wiritng', 'I
like read poem'),
+ (26,29, 'Mentor20' , 'Family20', 'f', '21000026', 'under25', 51, 'Major
3' , 'coffs', 'Paul
Woods', '5', 'no' , 'nowork' , 'no' , 'no' , '1', '0', '1', '0', '0', '0', 'no' , '0', '1', '1', '1', 'Wiritng', 'I
like read poem');

insert into smp_contact values (1, 'Carina College, SCU, Hogbin
Dr', 'Coffs
Harbour', '2450', '025555555', '045555555', '045555555', 'jia.kh...@gmail.com',
4,1);
insert into smp_contact values (2, '48 Ameroo Street,
Toormina ', 'Toormina ', '2452', '026666666', '046666666', '046666666', 'lsq...@gmail.com',
7,3);
=======================================
--- /trunk/smp-php/smp/domain/Student.php Sun Aug 29 05:58:28 2010
+++ /trunk/smp-php/smp/domain/Student.php Fri Oct 1 21:19:05 2010
@@ -41,7 +41,6 @@
var $preferOnCampus;
var $interests;
var $comments;
- var $accountStatus;
var $user;
var $contact;
var $mentees = array();
@@ -136,9 +135,6 @@
function setComments ($comments) {
$this->comments = $comments;
}
- function setAccountStatus ($accountStatus) {
- $this->accountStatus = $accountStatus;
- }
function setUser(smp_domain_User $user) {
$this->user = $user;
}
@@ -239,9 +235,6 @@
function getComments() {
return $this->comments;
}
- function getAccountStatus() {
- return $this->accountStatus;
- }
function getUser() {
return (is_null($this->user) ? new smp_domain_User() : $this->user);
}
=======================================
--- /trunk/smp-php/smp/mapper/StudentMapper.php Thu Sep 9 21:19:16 2010
+++ /trunk/smp-php/smp/mapper/StudentMapper.php Fri Oct 1 21:19:05 2010
@@ -15,8 +15,8 @@
parent::__construct();
$strInsertQuery = "INSERT INTO smp_student (user_id, firstname,
lastname, gender, student_number, age_range, course_id, major, study_mode,
recommended_by_staff";
$strInsertQuery .= ",semesters_completed,family_status, work_status,
tertiary_study_status,is_first_year, is_international, is_disability,
is_indigenous";
-
$strInsertQuery .= ",is_non_english,is_regional,is_socioeconomic,prefer_gender,prefer_australian,prefer_distance,prefer_international,prefer_on_campus,interests,comments,
account_status)";
-
$strInsertQuery .= "values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+
$strInsertQuery .= ",is_non_english,is_regional,is_socioeconomic,prefer_gender,prefer_australian,prefer_distance,prefer_international,prefer_on_campus,interests,comments)";
+
$strInsertQuery .= "values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
$this->insertStmt = self::$ADODB->Prepare($strInsertQuery);
}

@@ -51,7 +51,6 @@
$obj->setPreferOnCampus($array['prefer_on_campus']);
$obj->setInterests($array['interests']);
$obj->setComments($array['comments']);
- $obj->setAccountStatus($array['account_status']);
return $obj;
}

@@ -59,7 +58,7 @@
$values = array($obj->getUserId(), $obj->getFirstname(),
$obj->getLastname(), $obj->getGender(), $obj->getStudentNumber(),
$obj->getAgeRange(), $obj->getCourseId(), $obj->getMajor(),
$obj->getStudyMode(), $obj->getRecommendedByStaff(),
$obj->getSemestersCompleted(), $obj->getFamilyStatus(),
$obj->getWorkStatus(), $obj->getTertiaryStudyStatus(),
$obj->getIsFirstYear(),
$obj->getIsInternational(), $obj->getIsDisability(),
$obj->getIsIndigenous(), $obj->getIsNonEnglish(), $obj->getIsRegional(),
$obj->getIsSocioeconomic(), $obj->getPreferGender(),
- $obj->getPreferAustralian(), $obj->getPreferDistance(),
$obj->getPreferInternational(), $obj->getPreferOnCampus(),
$obj->getInterests(), $obj->getComments(), $obj->getAccountStatus());
+ $obj->getPreferAustralian(), $obj->getPreferDistance(),
$obj->getPreferInternational(), $obj->getPreferOnCampus(),
$obj->getInterests(), $obj->getComments());
return self::$ADODB->Execute($this->insertStmt, $values);
}

@@ -134,65 +133,5 @@
$studentId = $row['mentor_id'];
$mentor = self::find($studentId);
return $mentor;
- }
-
- function listMentors() {
- // Filter Student with Account status MENTOR
- $selectStmt = self::$ADODB->Prepare("SELECT * FROM smp_student WHERE
account_status like ?");
- $rs = self::$ADODB->Execute($selectStmt, array('%MENTOR%'));
- $list = array();
- if ($rs) {
- while ($row = $rs->FetchRow()) {
- $list[] = self::doCreateObject($row);
- }
- }
- return $list;
- }
-
- function listMentees() {
- // Filter Student with Account status MENTEE
- $selectStmt = self::$ADODB->Prepare("SELECT * FROM smp_student WHERE
account_status like ?");
- $rs = self::$ADODB->Execute($selectStmt, array('%MENTEE%'));
- $list = array();
- if ($rs) {
- while ($row = $rs->FetchRow()) {
- $list[] = self::doCreateObject($row);
- }
- }
- return $list;
- }
-
- // TODO Remove this method and Refactor related classes
- function listStudentWithAccountStatus($accountStatus) {
- // list Student with passed Account status
- $selectStmt = self::$ADODB->Prepare("SELECT * FROM smp_student WHERE
account_status like ?");
- $rs = self::$ADODB->Execute($selectStmt, array("%$accountStatus%"));
- $list = array();
- if ($rs) {
- while ($row = $rs->FetchRow()) {
- $list[] = self::doCreateObject($row);
- }
- }
- return $list;
- }
-
- // TODO Remove this method and Refactor related classes
- function listStudentWithAccountStatuses($arrAccountStatus) {
- // list Student with passed Account status
- $conditionString = "";
- foreach($arrAccountStatus as $ccountStatus) {
- $conditionString .= " account_status=? or";
- }
- $conditionString = substr($conditionString, 0, strlen($conditionString)
-3);
- $selectStmt = self::$ADODB->Prepare("SELECT * FROM smp_student WHERE ".
$conditionString. " ORDER BY id DESC");
- $rs = self::$ADODB->Execute($selectStmt, $arrAccountStatus);
- $list = array();
- if ($rs) {
- while ($row = $rs->FetchRow()) {
- $list[] = self::doCreateObject($row);
- }
- }
- return $list;
- }
-
-}
+ }
+}
=======================================
--- /trunk/smp-php/smp/service/StudentService.php Sun Sep 19 19:01:25 2010
+++ /trunk/smp-php/smp/service/StudentService.php Fri Oct 1 21:19:05 2010
@@ -27,23 +27,7 @@
function save(smp_domain_Student $student) {
return $this->studentMapper->save($student);
}
-
- function listMentors() {
- return $this->studentMapper->listMentors();
- }
-
- function listMentees() {
- return $this->studentMapper->listMentees();
- }
-
- function listStudentWithAccountStatus($accountStatus) {
- return
$this->studentMapper->listStudentWithAccountStatus($accountStatus);
- }
-
- function listStudentWithAccountStatuses(array $arrAccountStatus) {
- return
$this->studentMapper->listStudentWithAccountStatuses($arrAccountStatus);
- }
-
+
function find($id) {
return $this->studentMapper->find($id);
}
=======================================
--- /trunk/smp-php/smp/util/DatagridUtil.php Fri Sep 3 00:25:19 2010
+++ /trunk/smp-php/smp/util/DatagridUtil.php Fri Oct 1 21:19:05 2010
@@ -32,6 +32,9 @@

static function formatColumn($field , $datagrid) {
$column =& $datagrid->getColumnByField($field);
+ if (empty($column)) {
+ return $datagrid;
+ }
$column->setFormatter('format_'.$field);
return $datagrid;
}
=======================================
--- /trunk/smp-php/smp/view/common/footer.php Thu Sep 30 21:37:45 2010
+++ /trunk/smp-php/smp/view/common/footer.php Fri Oct 1 21:19:05 2010
@@ -1,11 +1,17 @@
-
+
</div><!-- end content -->
<div id="footer" class="grid_12">
+ &copy; <a href="http://scu.edu.au/">Southern Cross University</a>
+ &nbsp;|&nbsp; <a href="index.php">Home</a>
+ &nbsp;|&nbsp; <a href="index.php?cmd=public/about">About</a>
+ &nbsp;|&nbsp; <a href="index.php?cmd=public/contact">Contacting Us</a>
+ </div>
+ <div id="quotes" class="grid_12">
<iframe width="930px" height="80px" scrolling="auto"
- frameborder="0" allowtransparency="true"
-
src="http://quotes4all.net/quotes.html?quote_align=left&quote_background=49531f&image=none&image_size=40&author_align=left&padding=0&title_align=left">
- </iframe><br />
- Copyright&copy; 2010 by smp All Rights Reserved</div>
+ frameborder="0" allowtransparency="true"
+
src="http://quotes4all.net/quotes.html?quote_align=left&quote_background=49531f&image=none&image_size=40&author_align=left&padding=0&title_align=left">
+ </iframe>
+ </div>
</div><!-- end container -->
<script type="text/javascript">
<!--
=======================================
--- /trunk/smp-php/smp/view/log/list.php Tue Sep 21 05:27:40 2010
+++ /trunk/smp-php/smp/view/log/list.php Fri Oct 1 21:19:05 2010
@@ -12,7 +12,9 @@
print "<br/><h1>&nbsp; Log List</h1><br/>";

$datagrid = $request->getDatagrid();
-$datagrid = smp_util_DatagridUtil::formatColumn('user_id', $datagrid);
+if ($datagrid) {
+ $datagrid = smp_util_DatagridUtil::formatColumn('user_id', $datagrid);
+}

$table = smp_util_DatagridUtil::getCustomHtmlTable();
$datagrid->fill($table, smp_util_DatagridUtil::getRenderOptions());
=======================================
--- /trunk/smp-php/static/css/site.css Thu Sep 30 21:37:45 2010
+++ /trunk/smp-php/static/css/site.css Fri Oct 1 21:19:05 2010
@@ -35,6 +35,10 @@
background-color: white;
min-height: 740px;
}
+
+#footer {
+ background-color: white;
+}

h1,h2,h3,h4,h5,h6 {
font-family: tahoma, arial, helvetica, sans-serif;
@@ -74,119 +78,6 @@
float: right;
padding: 10px;
}
-
-/* TABLE */
-table {
- font-size: 1em;
- margin: 0 0 1.5em 0;
- padding: 0;
-}
-
-table caption {
- font-weight: bold;
- margin: 0 0 0 0;
- padding: 0 0 1.5em 0;
-}
-
-th {
- font-weight: bold;
- text-align: left;
-}
-
-td {
- font-size: 1em;
-}
-
-/*********************************
- Project: CSS Table Galery
- Title: Like Adwords
- Author: Cleiton Francisco
- URL: http://www.cleiton.net/
- Country: Brazil
- Update: 2005-12-18
- *******************************/
-.table {
- border-collapse: collapse;
- border: 2px solid #74b3dc;
- color: #000;
- background: #fff;
- width: 100%;
- }
-.table caption {
- padding: 0 0.6em 0.8em;
- font-size: 1.3em;
- font-weight: bold;
- text-align: left;
- color: #000;
- background: transparent;
- }
-/* For Tapestry's contribTable */
-.table th table, .table th table td {
- width: 100%;
- border: 0px;
- }
-.contribTable th {
- padding: 0px !important;
- background: #d7e9f5;
- }
-.contribTable th .tableHeaderTable {
- margin: 0px !important;
- }
-.table td, .table th, .tableHeaderTable td {
- border: 1px solid silver;
- padding: 0.5em;
- }
-.table th {
- background-color: #d7e9f5;
- }
-.table thead th, .tableHeaderTable td {
- border: 1px solid #e0e0e0;
- text-align: left;
- font-size: 1em;
- font-weight: bold;
- background: #d7e9f5;
- }
-.tableHeaderTable td a {
- text-decoration: none !important;
- }
-.table tfoot th, tfoot td {
- border: 1px solid #e0e0e0;
- text-align: left;
- font-size: 1em;
- background: #e8e8cf;
- }
-.table tfoot th {
- font-weight: bold;
- }
-.table tbody td a {
- background: transparent;
- text-decoration: underline;
- }
-.table tbody td a:hover {
- background: transparent;
- text-decoration: underline;
- }
-.table tbody th a {
- background: transparent;
- text-decoration: underline;
- font-weight: bold;
- }
-.table tbody th, .table tbody td {
- text-align: left;
- }
-.table tfoot td {
- border: 1px solid #996;
- }
-.table tbody tr:hover, .table tr.over, .contribTable tr:hover {
- background: #ffffd9 !important; /* important needed for Tapestry, as
is .table tr:hover */
- }
-.contribTable tr.even {
- background: #fff !important;
- }
-.contribTable tr.odd {
- background: #eee !important;
- }
-/* END TABLE */

/* Container

----------------------------------------------------------------------------------------------------*/
=======================================
--- /trunk/smp-php/static/css/theme.css Tue Jul 6 08:14:47 2010
+++ /trunk/smp-php/static/css/theme.css Fri Oct 1 21:19:05 2010
@@ -3,6 +3,7 @@
@import "reset.css";
@import "text.css";
@import "960.css";
-@import "site.css";
@import "menu/SpryMenuBarHorizontal.css";
@import "form.css";
+@import "table.css";
+@import "site.css";

Reply all
Reply to author
Forward
0 new messages