Index: openacs-4/packages/dotlrn-ecommerce/lib/section.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/lib/section.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/dotlrn-ecommerce/lib/section.tcl 20 Jul 2005 17:39:46 -0000 1.12
+++ openacs-4/packages/dotlrn-ecommerce/lib/section.tcl 21 Jul 2005 09:35:26 -0000 1.13
@@ -226,6 +226,7 @@
ad_form -extend -name add_section -form {
{notify_waiting_number:text,optional {label "Notify admin when waiting list reaches:"} {html {size 5 maxlength 3}}}
{show_participants_p:text(radio) {label "Show Number of Participants"} {options {{Yes t} {No f}}}}
+ {show_sessions_p:text(radio) {label "Show Sessions Information"} {options {{Yes t} {No f}}}}
}
lappend validate {notify_waiting_number
{ [empty_string_p $notify_waiting_number] || [regexp {^(0*)(([1-9][0-9]*))$} $notify_waiting_number match zeros value] }
@@ -310,6 +311,7 @@
set ${cal_item_id} $start_date
}
set show_participants_p t
+ set show_sessions_p t
} -new_request {
set product_id 0
set price [template::util::currency::create "$" "0" "." "00" ]
@@ -491,8 +493,8 @@
# Use item_id as course_id coz course_id is the revision and
# its easier to keep track of the item_id
db_dml add_section {
- insert into dotlrn_ecommerce_section(section_id, course_id, section_name, community_id,product_id, notify_waiting_number, show_participants_p) values
- (:section_id, :item_id, :section_name, :community_id, :product_id, :notify_waiting_number, :show_participants_p)
+ insert into dotlrn_ecommerce_section(section_id, course_id, section_name, community_id,product_id, notify_waiting_number, show_participants_p, show_sessions_p) values
+ (:section_id, :item_id, :section_name, :community_id, :product_id, :notify_waiting_number, :show_participants_p, :show_sessions_p)
}
# for this to work, dotlrn_eccomerce_section must be an object
@@ -565,7 +567,8 @@
update dotlrn_ecommerce_section set
section_name = :section_name,
notify_waiting_number = :notify_waiting_number,
- show_participants_p = :show_participants_p
+ show_participants_p = :show_participants_p,
+ show_sessions_p = :show_sessions_p
where section_id = :section_id
}
Index: openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk-oracle.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk-oracle.xql 20 Jul 2005 11:35:33 -0000 1.3
+++ openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk-oracle.xql 21 Jul 2005 09:35:26 -0000 1.4
@@ -21,7 +21,7 @@
select dc.course_id, dc.course_key, dc.course_name,
dc.assessment_id, dec.section_id, dec.section_name,
dec.product_id, dec.community_id, dc.course_info,
- ci.item_id, v.maxparticipants, dec.show_participants_p
+ ci.item_id, v.maxparticipants, dec.show_participants_p, dec.show_sessions_p
from
dotlrn_catalog dc,
cr_items ci,
Index: openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk-postgresql.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk-postgresql.xql 20 Jul 2005 11:35:33 -0000 1.3
+++ openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk-postgresql.xql 21 Jul 2005 09:35:26 -0000 1.4
@@ -20,7 +20,7 @@
select dc.course_id, dc.course_key, dc.course_name,
dc.assessment_id, dec.section_id, dec.section_name,
dec.product_id, dec.community_id, dc.course_info,
- ci.item_id, v.maxparticipants, dec.show_participants_p
+ ci.item_id, v.maxparticipants, dec.show_participants_p, dec.show_sessions_p
from dotlrn_catalog dc,
cr_items ci
left join dotlrn_ecommerce_section dec
Index: openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk.tcl,v
diff -u -r1.22 -r1.23
--- openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk.tcl 20 Jul 2005 17:40:05 -0000 1.22
+++ openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk.tcl 21 Jul 2005 09:35:26 -0000 1.23
@@ -301,7 +301,7 @@
</else>(<a href="@course_list.section_pages_url@">more info</a>)
<if @course_list.section_grades@ not nil> (@course_list.section_grades@)</if>
- <if @course_list.sessions@ not nil><br />@course_list.sessions;noquote@</if>
+ <if @course_list.sessions@ not nil and @course_list.show_sessions_p@ eq "t"><br />@course_list.sessions;noquote@</if>
<if @course_list.instructor_names@ not nil><br />@course_list.instructor_names;noquote@</if>
<if @course_list.prices@ not nil><br />@course_list.prices;noquote@</if>
<if @course_list.show_participants_p@ eq "t">
Index: openacs-4/packages/dotlrn-ecommerce/sql/postgresql/dotlrn-ecommerce-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/sql/postgresql/dotlrn-ecommerce-create.sql,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/dotlrn-ecommerce/sql/postgresql/dotlrn-ecommerce-create.sql 20 Jul 2005 17:40:19 -0000 1.13
+++ openacs-4/packages/dotlrn-ecommerce/sql/postgresql/dotlrn-ecommerce-create.sql 21 Jul 2005 09:35:26 -0000 1.14
@@ -29,7 +29,8 @@
notify_waiting_number integer,
member_price_number numeric,
non_member_price numeric,
- show_participants_p char(1) check (show_participants_p in ('t','f'))
+ show_participants_p char(1) check (show_participants_p in ('t','f')),
+ show_sessions_p char(1) check (show_sessions_p in ('t','f'))
);
create index dotlrn_ecommerce_community_id_idx ON dotlrn_ecommerce_section (community_id);