Index: openacs-4/packages/dotlrn-ecommerce/dotlrn-ecommerce.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/dotlrn-ecommerce.info,v diff -u -r1.11 -r1.12 --- openacs-4/packages/dotlrn-ecommerce/dotlrn-ecommerce.info 22 Jul 2005 00:31:02 -0000 1.11 +++ openacs-4/packages/dotlrn-ecommerce/dotlrn-ecommerce.info 22 Jul 2005 10:56:09 -0000 1.12 @@ -7,17 +7,18 @@ f t - + Roel Canicula Package to tie the dotLRN, Ecommerce, Assessments and dotLRN Catalog packages together Solution Grove Package to tie the dotLRN, Ecommerce, Assessments and dotLRN Catalog packages together. Initially intended for the MOS and MGH projects, the goal is to create a reusable module for similar projects. 0 - + + Index: openacs-4/packages/dotlrn-ecommerce/catalog/dotlrn-ecommerce.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/catalog/dotlrn-ecommerce.en_US.ISO-8859-1.xml,v diff -u -r1.13 -r1.14 --- openacs-4/packages/dotlrn-ecommerce/catalog/dotlrn-ecommerce.en_US.ISO-8859-1.xml 22 Jul 2005 00:25:16 -0000 1.13 +++ openacs-4/packages/dotlrn-ecommerce/catalog/dotlrn-ecommerce.en_US.ISO-8859-1.xml 22 Jul 2005 10:56:09 -0000 1.14 @@ -10,6 +10,7 @@ (application pending) Application rejected apply for course + Assistant Instructor (awaiting approval) Balance due: Bill to: @@ -77,8 +78,7 @@ Please select a section from the list Please select a section under this course Process Purchase for %section_name% - Purchase - another Course/Section + Purchase another Course/Section Purchase another Course/Section Register for Another Course Register for another course @@ -93,8 +93,7 @@ Thank You For Your Order The course only has $available_slots slot(s) left The following has been sent to the purchaser - To complete your order, submit this form, and confirm the information - on the following page. + To complete your order, submit this form, and confirm the information on the following page. to send us your order! User requests for approval Users in waiting list 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.14 -r1.15 --- openacs-4/packages/dotlrn-ecommerce/lib/section.tcl 21 Jul 2005 21:19:01 -0000 1.14 +++ openacs-4/packages/dotlrn-ecommerce/lib/section.tcl 22 Jul 2005 10:56:09 -0000 1.15 @@ -105,7 +105,7 @@ } ad_form -extend -name add_section -form { - { instructors:string(multiselect),multiple,optional {label "Instructors"} {options { $instructors_list } } } + { instructors:string(multiselect),multiple,optional {label "#dotlrn-ecommerce.Instructor#"} {options { $instructors_list } } } } } @@ -123,7 +123,7 @@ } ad_form -extend -name add_section -form { - { assistants:string(multiselect),multiple,optional {label "Assistants"} {options { $assistants_list } } } + { assistants:string(multiselect),multiple,optional {label "#dotlrn-ecommerce.assistant_instructor#"} {options { $assistants_list } } } } } @@ -168,7 +168,15 @@ } } +# TICKET #159 section_description +ad_form -extend -name add_section -form { + {description:text(textarea) + {label "Description"} + {html {cols 25 rows 10}} + } +} + # ecommerce stuff set exclude_list [list "'classid'"] @@ -491,8 +499,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, show_sessions_p) values - (:section_id, :item_id, :section_name, :community_id, :product_id, :notify_waiting_number, :show_participants_p, :show_sessions_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, description) values + (:section_id, :item_id, :section_name, :community_id, :product_id, :notify_waiting_number, :show_participants_p, :show_sessions_p, :description) } # for this to work, dotlrn_eccomerce_section must be an object @@ -566,7 +574,8 @@ section_name = :section_name, notify_waiting_number = :notify_waiting_number, show_participants_p = :show_participants_p, - show_sessions_p = :show_sessions_p + show_sessions_p = :show_sessions_p, + description = :description where section_id = :section_id } Index: openacs-4/packages/dotlrn-ecommerce/sql/oracle/dotlrn-ecommerce-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/sql/oracle/dotlrn-ecommerce-create.sql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/dotlrn-ecommerce/sql/oracle/dotlrn-ecommerce-create.sql 4 Jul 2005 14:28:32 -0000 1.1 +++ openacs-4/packages/dotlrn-ecommerce/sql/oracle/dotlrn-ecommerce-create.sql 22 Jul 2005 10:56:09 -0000 1.2 @@ -19,7 +19,8 @@ waiting_list_p char(1) check (waiting_list_p in ('t','f')), notify_waiting_number integer, member_price_number numeric, - non_member_price numeric + non_member_price numeric, + description text ); create index de_community_id_idx ON dotlrn_ecommerce_section (community_id); Index: openacs-4/packages/dotlrn-ecommerce/sql/oracle/upgrade/upgrade-0.1d-0.1d1.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/sql/oracle/upgrade/upgrade-0.1d-0.1d1.sql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn-ecommerce/sql/oracle/upgrade/upgrade-0.1d-0.1d1.sql 22 Jul 2005 10:56:09 -0000 1.1 @@ -0,0 +1,5 @@ +-- +-- packages/dotlrn-ecommerce/sql/postgresql/upgrade/upgrade-0.1d-0.1d1.sql +-- + +alter table dotlrn_ecommerce_section add column description text; \ No newline at end of file Index: openacs-4/packages/dotlrn-ecommerce/sql/postgresql/upgrade/upgrade-0.1d-0.1d1.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/sql/postgresql/upgrade/upgrade-0.1d-0.1d1.sql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn-ecommerce/sql/postgresql/upgrade/upgrade-0.1d-0.1d1.sql 22 Jul 2005 10:56:09 -0000 1.1 @@ -0,0 +1,5 @@ +-- +-- packages/dotlrn-ecommerce/sql/postgresql/upgrade/upgrade-0.1d-0.1d1.sql +-- + +alter table dotlrn_ecommerce_section add column description text; \ No newline at end of file Index: openacs-4/packages/dotlrn-ecommerce/tcl/apm-callback-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/tcl/apm-callback-procs.tcl,v diff -u -r1.12 -r1.13 --- openacs-4/packages/dotlrn-ecommerce/tcl/apm-callback-procs.tcl 22 Jul 2005 04:35:11 -0000 1.12 +++ openacs-4/packages/dotlrn-ecommerce/tcl/apm-callback-procs.tcl 22 Jul 2005 10:56:09 -0000 1.13 @@ -62,10 +62,35 @@ -datatype "boolean" \ -pretty_name "Flag to display or hide course" \ -sort_order $sort_order \ - -default_value "true" + -default_value "true" \ -column_spec "boolean" } +ad_proc -private dotlrn_ecommerce::after_upgrade { + -from_version_name + -to_version_name +} { + + + @author Hamilton Chua (hamilton.chua@gmail.com) + @creation-date 2005-07-22 + + @param from_version_name + + @param to_version_name + + @return + + @error +} { + + #apm_upgrade_logic \ + # -from_version_name $from_version_name \ + # -to_version_name $to_version_name \ + # -spec { + # } +} + ad_proc -private dotlrn-catalog::package_mount { -package_id -node_id