Index: openacs-4/packages/recruiting/dotlrn-recruiting.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/Attic/dotlrn-recruiting.info,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/recruiting/dotlrn-recruiting.info 2 Aug 2002 16:48:26 -0000 1.5
+++ openacs-4/packages/recruiting/dotlrn-recruiting.info 2 Aug 2002 18:53:56 -0000 1.6
@@ -31,8 +31,11 @@
<file type="query_file" path="www/admin/assign-candidate-interview.xql"/>
<file type="content_page" path="www/admin/change-candidate-status.adp"/>
<file type="content_page" path="www/admin/change-candidate-status.tcl"/>
+ <file type="query_file" path="www/admin/change-candidate-status.xql"/>
<file type="content_page" path="www/admin/delete-candidate.adp"/>
<file type="content_page" path="www/admin/delete-candidate.tcl"/>
+ <file type="content_page" path="www/admin/delete-interview.adp"/>
+ <file type="content_page" path="www/admin/delete-interview.tcl"/>
<file type="content_page" path="www/admin/disable-criteria.tcl"/>
<file type="query_file" path="www/admin/disable-criteria.xql"/>
<file type="content_page" path="www/admin/disable-status-type.tcl"/>
Index: openacs-4/packages/recruiting/tcl/dotlrn-recruiting-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/tcl/dotlrn-recruiting-procs.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/recruiting/tcl/dotlrn-recruiting-procs.tcl 2 Aug 2002 16:48:26 -0000 1.7
+++ openacs-4/packages/recruiting/tcl/dotlrn-recruiting-procs.tcl 2 Aug 2002 18:53:56 -0000 1.8
@@ -330,8 +330,8 @@
} {
delete an interview
} {
- db_exec_plsql delete_ratings {}
- db_exec_plsql delete_interview {}
+ db_dml delete_ratings {}
+ db_dml delete_interview {}
}
ad_proc -public get {
@@ -381,7 +381,7 @@
} {
delete a rating
} {
- db_exec_plsql delete_rating {}
+ db_dml delete_rating {}
}
ad_proc -public get {
Index: openacs-4/packages/recruiting/www/my-completed-interviews.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/my-completed-interviews.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/recruiting/www/my-completed-interviews.tcl 1 Aug 2002 22:14:37 -0000 1.2
+++ openacs-4/packages/recruiting/www/my-completed-interviews.tcl 2 Aug 2002 18:53:56 -0000 1.3
@@ -14,7 +14,11 @@
table::setColumnHeadings interviews [list "Name" "Location" "Average Rating" "Hiring Recommendation"]
table::setColumnAlignment interviews [list left left center center]
db_foreach my_completed_interviews {} {
- table::addSortableRow interviews [list "$last_name, $first_name" "$location" "$average_rating" "$should_hire_p" "(<a href=\"rating-sheet?[export_vars interview_id]\">view my ratings</a>) (<a href=edit-ratings?[export_vars {candidate_id interview_id}]>modify interview</a>)"]
+ table::addSortableRow interviews [list "$last_name, $first_name" \
+ "$location<br>Home: [recruiting_candidate::format_phone -phone_number $home_phone]<br>Mobile: [recruiting_candidate::format_phone -phone_number $cell_phone]" \
+ "$average_rating" \
+ "$should_hire_p" \
+ "(<a href=\"rating-sheet?[export_vars interview_id]\">view my ratings</a>) (<a href=edit-ratings?[export_vars {candidate_id interview_id}]>modify interview</a>)"]
} if_no_rows {
table::addSortableRow interviews [list "You haven't interviewed any candidates."]
}
Index: openacs-4/packages/recruiting/www/my-completed-interviews.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/my-completed-interviews.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/recruiting/www/my-completed-interviews.xql 1 Aug 2002 21:18:09 -0000 1.1
+++ openacs-4/packages/recruiting/www/my-completed-interviews.xql 2 Aug 2002 18:53:56 -0000 1.2
@@ -10,6 +10,7 @@
c.email,
-- c.phone_number,
c.city||', '||c.state||' '||c.country as location,
+ c.home_phone, c.cell_phone,
round((select avg(r.rating)
from recruiting_ratings r
where interview_id = i.interview_id),1) as average_rating,
Index: openacs-4/packages/recruiting/www/my-new-interviews.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/my-new-interviews.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/recruiting/www/my-new-interviews.tcl 1 Aug 2002 21:18:09 -0000 1.1
+++ openacs-4/packages/recruiting/www/my-new-interviews.tcl 2 Aug 2002 18:53:56 -0000 1.2
@@ -13,7 +13,9 @@
table::setTitle interviews "Candidates for you to interview"
table::setColumnHeadings interviews [list "Name" "Location"]
db_foreach my_new_interviews {} {
- table::addSortableRow interviews [list "$last_name, $first_name" "$location" "(<a href=\"rate-candidate?[export_vars {interview_id candidate_id}]\">rate this candidate</a>)"]
+ table::addSortableRow interviews [list "$last_name, $first_name" \
+ "$location<br>Home: [recruiting_candidate::format_phone -phone_number $home_phone]<br>Mobile: [recruiting_candidate::format_phone -phone_number $cell_phone]" \
+ "(<a href=\"rate-candidate?[export_vars {interview_id candidate_id}]\">rate this candidate</a>)"]
} if_no_rows {
table::addSortableRow interviews [list "You don't have any candidates to interview right now."]
}
Index: openacs-4/packages/recruiting/www/my-new-interviews.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/my-new-interviews.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/recruiting/www/my-new-interviews.xql 1 Aug 2002 21:18:09 -0000 1.1
+++ openacs-4/packages/recruiting/www/my-new-interviews.xql 2 Aug 2002 18:53:56 -0000 1.2
@@ -8,7 +8,7 @@
c.last_name,
c.first_name,
c.email,
- -- c.phone_number,
+ c.home_phone, c.cell_phone,
c.city||', '||c.state||' '||c.country as location
from recruiting_interviews i,
recruiting_candidates c
Index: openacs-4/packages/recruiting/www/rate-candidate.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/rate-candidate.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/recruiting/www/rate-candidate.tcl 2 Aug 2002 16:48:26 -0000 1.2
+++ openacs-4/packages/recruiting/www/rate-candidate.tcl 2 Aug 2002 18:53:56 -0000 1.3
@@ -64,8 +64,7 @@
-package_id $package_id \
-interview_id $interview_id \
-criteria_id $criteria_id \
- -rating [set criteria_$criteria_id] \
- -comment $comment
+ -rating [set criteria_$criteria_id]
}
}
Index: openacs-4/packages/recruiting/www/admin/change-candidate-status.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/admin/change-candidate-status.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/recruiting/www/admin/change-candidate-status.tcl 1 Aug 2002 00:45:49 -0000 1.1
+++ openacs-4/packages/recruiting/www/admin/change-candidate-status.tcl 2 Aug 2002 18:53:56 -0000 1.2
@@ -30,25 +30,12 @@
form get_values change_status \
status
- recruiting_candidate::update_candidate \
- -candidate_id $info(candidate_id) \
- -first_name $info(first_name) \
- -last_name $info(last_name) \
- -address1 $info(address1) \
- -address2 $info(address2) \
- -city $info(city) \
- -state $info(state) \
- -zip $info(zip) \
- -zip_plus_four $info(zip_plus_four) \
- -country $info(country) \
- -email $info(email) \
- -status $status \
- -package_id $package_id
-
+ db_dml update_status {}
+
ad_returnredirect view-one-candidate?[export_vars candidate_id]
ad_script_abort
}
-set context_bar [list [list "../" "Recruiting"] [list "index" "Admin"] [list "list-candidates" "Candidates"] [list "view-one-candidate?[export_vars candidate_id]"] "Change Status"]
+set context_bar [list [list "../" "Recruiting"] [list "index" "Admin"] [list "list-candidates" "Candidates"] [list "view-one-candidate?[export_vars candidate_id]" "One Candidate"] "Change Status"]
ad_return_template
Index: openacs-4/packages/recruiting/www/admin/change-candidate-status.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/admin/change-candidate-status.xql,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/recruiting/www/admin/change-candidate-status.xql 2 Aug 2002 18:53:56 -0000 1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<queryset>
+
+ <fullquery name="update_status">
+ <querytext>
+ update recruiting_candidates
+ set status = :status
+ where candidate_id = :candidate_id
+ </querytext>
+ </fullquery>
+
+</queryset>
Index: openacs-4/packages/recruiting/www/admin/delete-candidate.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/admin/delete-candidate.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/recruiting/www/admin/delete-candidate.tcl 2 Aug 2002 16:48:26 -0000 1.1
+++ openacs-4/packages/recruiting/www/admin/delete-candidate.tcl 2 Aug 2002 18:53:56 -0000 1.2
@@ -20,7 +20,7 @@
array set candidate_info [recruiting_candidate::get -candidate_id $candidate_id]
table::setTitle delete "Deleting $candidate_info(first_name) $candidate_info(last_name)"
- table::setForm delete delete-candidate
+ table::setForm delete [ns_conn url]
table::addUnsortedRow delete [list "<center><br>Are you sure you want to delete $candidate_info(first_name) $candidate_info(last_name)?<br><input type=submit name=delete_p value=Yes> <input type=submit name=delete_p value=No><br>[export_form_vars referrer candidate_id]</center>"]
set context_bar [list [list "../" "Recruiting"] [list "index" "Admin"] [list "list-candidates" "Candidates"] "Delete Candidate"]
Index: openacs-4/packages/recruiting/www/admin/delete-interview.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/admin/delete-interview.adp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/recruiting/www/admin/delete-interview.adp 2 Aug 2002 18:53:56 -0000 1.1
@@ -0,0 +1,5 @@
+<master src="recruiting-admin-master">
+<property name="context_bar">@context_bar@</property>
+
+<%= [table::outputTable delete] %>
+
Index: openacs-4/packages/recruiting/www/admin/delete-interview.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/admin/delete-interview.tcl,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/recruiting/www/admin/delete-interview.tcl 2 Aug 2002 18:53:56 -0000 1.1
@@ -0,0 +1,39 @@
+ad_page_contract {
+ recruiting admin interface
+ access admin function such as: criteria specification
+ and interviewee status types
+
+ @author chak (chak@openforce.net)
+ @creation-date 2002-07-30
+ @version $Id: delete-interview.tcl,v 1.1 2002/08/02 18:53:56 chak Exp $
+} {
+ interview_id:notnull
+ candidate_id:notnull
+ referrer:notnull
+ {delete_p "notyet"}
+}
+
+set package_id [ad_conn package_id]
+set user_id [ad_verify_and_get_user_id]
+
+if {$delete_p == "notyet"} {
+
+ array set candidate_info [recruiting_candidate::get -candidate_id $candidate_id]
+ array set interview_info [recruiting_interview::get -interview_id $interview_id]
+
+ table::setTitle delete "Deleting interview for $candidate_info(first_name) $candidate_info(last_name)"
+ table::setForm delete [ns_conn url]
+ table::addUnsortedRow delete [list "<center><br>Are you sure you want to delete $candidate_info(first_name) $candidate_info(last_name)'s interview?<br><br><input type=submit name=delete_p value=Yes> <input type=submit name=delete_p value=No><br>[export_form_vars referrer candidate_id interview_id]<br></center>"]
+
+ set context_bar [list [list "../" "Recruiting"] [list "index" "Admin"] [list "list-candidates" "Candidates"] [list "view-one-candidate?[export_vars candidate_id]" "One Candidate"] "Delete Interview"]
+
+ ad_return_template
+
+} else {
+
+ if {$delete_p == "Yes"} {
+ recruiting_interview::delete -interview_id $interview_id
+ }
+ ns_returnredirect [ns_urldecode $referrer]
+
+}
Index: openacs-4/packages/recruiting/www/admin/edit-candidate.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/admin/edit-candidate.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/recruiting/www/admin/edit-candidate.tcl 2 Aug 2002 16:48:26 -0000 1.2
+++ openacs-4/packages/recruiting/www/admin/edit-candidate.tcl 2 Aug 2002 18:53:56 -0000 1.3
@@ -75,29 +75,32 @@
-datatype text \
-widget text \
-html {size 4} \
- -optional \
- -value $info(zip_plus_four)
+ -value $info(zip_plus_four) \
+ -optional
element create edit_candidate country \
-label "Country:" \
-datatype text \
-widget text \
-html {size 30} \
- -value $info(country)
+ -value $info(country) \
+ -optional
element create edit_candidate home_phone \
-label "Home phone:" \
-datatype text \
-widget text \
-html {size 14} \
- -value [recruiting_candidate::format_phone -phone_number $info(home_phone)]
+ -value [recruiting_candidate::format_phone -phone_number $info(home_phone)] \
+ -optional
element create edit_candidate cell_phone \
-label "Mobile phone:" \
-datatype text \
-widget text \
-html {size 14} \
- -value [recruiting_candidate::format_phone -phone_number $info(cell_phone)]
+ -value [recruiting_candidate::format_phone -phone_number $info(cell_phone)] \
+ -optional
element create edit_candidate email \
-label "Email:" \
Index: openacs-4/packages/recruiting/www/admin/new-candidate.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/admin/new-candidate.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/recruiting/www/admin/new-candidate.tcl 2 Aug 2002 16:48:26 -0000 1.3
+++ openacs-4/packages/recruiting/www/admin/new-candidate.tcl 2 Aug 2002 18:53:56 -0000 1.4
@@ -72,19 +72,22 @@
-label "Country:" \
-datatype text \
-widget text \
- -html {size 30}
+ -html {size 30} \
+ -optional
element create new_candidate home_phone \
-label "Home phone:" \
-datatype text \
-widget text \
- -html {size 14}
+ -html {size 14} \
+ -optional
element create new_candidate cell_phone \
-label "Mobile phone:" \
-datatype text \
-widget text \
- -html {size 14}
+ -html {size 14} \
+ -optional
element create new_candidate email \
-label "Email:" \
Index: openacs-4/packages/recruiting/www/admin/view-one-candidate.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/admin/view-one-candidate.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/recruiting/www/admin/view-one-candidate.tcl 2 Aug 2002 16:48:26 -0000 1.5
+++ openacs-4/packages/recruiting/www/admin/view-one-candidate.tcl 2 Aug 2002 18:53:56 -0000 1.6
@@ -56,7 +56,9 @@
"$num_ratings out of $possible_ratings" \
"[db_string get_average_rating {}]" \
"[db_string get_should_hire_p {}]" \
- "(<a href=view-ratings?[export_vars interview_id]>view ratings</a>) (<a href=view-comments?[export_vars candidate_id]>view comments</a>)"]
+ "(<a href=view-ratings?[export_vars interview_id]>view ratings</a>)
+ (<a href=view-comments?[export_vars candidate_id]>view comments</a>)
+ (<a href=delete-interview?[export_vars {interview_id candidate_id referrer}]>delete</a>)"]
} if_no_rows {
table::addUnsortedRow interviews [list "No Interviews assigned. (<a href=assign-candidate-interview?[export_vars candidate_id]>assign one</a>)"]
}