+
{{space.name}}
diff --git a/app/controllers/api/trainings_controller.rb b/app/controllers/api/trainings_controller.rb
index 45ae39af5..9e452b346 100644
--- a/app/controllers/api/trainings_controller.rb
+++ b/app/controllers/api/trainings_controller.rb
@@ -57,7 +57,7 @@ class API::TrainingsController < API::ApiController
def availabilities
authorize Training
@training = Training.find(params[:id])
- @availabilities = @training.availabilities.includes(slots: {reservation: {user: [:profile, :trainings] }}).order('start_at DESC')
+ @availabilities = @training.availabilities.includes(slots: {reservations: {user: [:profile, :trainings] }}).order('start_at DESC')
end
private
diff --git a/app/models/plan.rb b/app/models/plan.rb
index a9a7f72e2..8db94ae01 100644
--- a/app/models/plan.rb
+++ b/app/models/plan.rb
@@ -11,7 +11,7 @@ class Plan < ActiveRecord::Base
has_many :prices, dependent: :destroy
extend FriendlyId
- friendly_id :name, use: :slugged
+ friendly_id :base_name, use: :slugged
accepts_nested_attributes_for :prices
accepts_nested_attributes_for :plan_file, allow_destroy: true, reject_if: :all_blank
@@ -27,7 +27,8 @@ class Plan < ActiveRecord::Base
validates :amount, :group, :base_name, presence: true
validates :interval_count, numericality: { only_integer: true, greater_than_or_equal_to: 1 }
- validates :interval, inclusion: { in: %w(year month) }
+ validates :interval, inclusion: { in: %w(year month week) }
+ validates :base_name, :slug, presence: true
def self.create_for_all_groups(plan_params)
plans = []
diff --git a/app/views/api/trainings/availabilities.json.jbuilder b/app/views/api/trainings/availabilities.json.jbuilder
index 424cfc3ba..d65a5a1c8 100644
--- a/app/views/api/trainings/availabilities.json.jbuilder
+++ b/app/views/api/trainings/availabilities.json.jbuilder
@@ -4,8 +4,8 @@ json.availabilities @availabilities do |a|
json.start_at a.start_at.iso8601
json.end_at a.end_at.iso8601
json.reservation_users a.slots.map do |slot|
- json.id slot.reservation.user_id
- json.full_name slot.reservation.user.profile.full_name
- json.is_valid slot.reservation.user.trainings.include?(@training)
+ json.id slot.reservations.first.user_id
+ json.full_name slot.reservations.first.user.profile.full_name
+ json.is_valid slot.reservations.first.user.trainings.include?(@training)
end
end
diff --git a/config/locales/app.shared.en.yml b/config/locales/app.shared.en.yml
index 73717c478..146a5d7c1 100644
--- a/config/locales/app.shared.en.yml
+++ b/config/locales/app.shared.en.yml
@@ -213,6 +213,7 @@ en:
period: "Period"
year: "Year"
month: "Month"
+ week: "Week"
period_is_required: "Period is required."
subscription_price: "Subscription price"
price_is_required: "Price is required."
diff --git a/config/locales/app.shared.fr.yml b/config/locales/app.shared.fr.yml
index 31e080b30..b63e7154d 100644
--- a/config/locales/app.shared.fr.yml
+++ b/config/locales/app.shared.fr.yml
@@ -213,6 +213,7 @@ fr:
period: "Période"
year: "Année"
month: "Mois"
+ week: "Semaine"
period_is_required: "La période est requise."
subscription_price: "Coût de l'abonnement"
price_is_required: "Le prix est requis."
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 910fc6d6e..a7aaed932 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -83,7 +83,7 @@ en:
details: "Details"
amount: "Amount"
subscription_extended_for_free_from_START_to_END: "Subscription extended for free - From %{START} to %{END}"
- subscription_NAME_from_START_to_END: "Subscription - From %{START} to %{END}"
+ subscription_NAME_from_START_to_END: "Subscription %{NAME} - From %{START} to %{END}"
machine_reservation_DESCRIPTION: "Machine reservation - %{DESCRIPTION}"
space_reservation_DESCRIPTION: "Space reservation - %{DESCRIPTION}"
training_reservation_DESCRIPTION: "Training reservation - %{DESCRIPTION}"
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 2efae5864..accf3c94d 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -83,7 +83,7 @@ fr:
details: "Détails"
amount: "Montant"
subscription_extended_for_free_from_START_to_END: "Abonnement prolongé gratuitement - Du %{START} au %{END}"
- subscription_NAME_from_START_to_END: "Abonnement - Du %{START} au %{END}"
+ subscription_NAME_from_START_to_END: "Abonnement %{NAME} - Du %{START} au %{END}"
machine_reservation_DESCRIPTION: "Réservation Machine - %{DESCRIPTION}"
space_reservation_DESCRIPTION: "Réservation Espace - %{DESCRIPTION}"
training_reservation_DESCRIPTION: "Réservation Formation - %{DESCRIPTION}"
diff --git a/db/schema.rb b/db/schema.rb
index 372d18c04..a76ff5499 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -15,8 +15,8 @@ ActiveRecord::Schema.define(version: 20170227114634) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
- enable_extension "pg_trgm"
enable_extension "unaccent"
+ enable_extension "pg_trgm"
create_table "abuses", force: :cascade do |t|
t.integer "signaled_id"
@@ -32,14 +32,14 @@ ActiveRecord::Schema.define(version: 20170227114634) do
add_index "abuses", ["signaled_type", "signaled_id"], name: "index_abuses_on_signaled_type_and_signaled_id", using: :btree
create_table "addresses", force: :cascade do |t|
- t.string "address", limit: 255
- t.string "street_number", limit: 255
- t.string "route", limit: 255
- t.string "locality", limit: 255
- t.string "country", limit: 255
- t.string "postal_code", limit: 255
+ t.string "address"
+ t.string "street_number"
+ t.string "route"
+ t.string "locality"
+ t.string "country"
+ t.string "postal_code"
t.integer "placeable_id"
- t.string "placeable_type", limit: 255
+ t.string "placeable_type"
t.datetime "created_at"
t.datetime "updated_at"
end
@@ -55,9 +55,9 @@ ActiveRecord::Schema.define(version: 20170227114634) do
create_table "assets", force: :cascade do |t|
t.integer "viewable_id"
- t.string "viewable_type", limit: 255
- t.string "attachment", limit: 255
- t.string "type", limit: 255
+ t.string "viewable_type"
+ t.string "attachment"
+ t.string "type"
t.datetime "created_at"
t.datetime "updated_at"
end
@@ -74,11 +74,11 @@ ActiveRecord::Schema.define(version: 20170227114634) do
create_table "availabilities", force: :cascade do |t|
t.datetime "start_at"
t.datetime "end_at"
- t.string "available_type", limit: 255
+ t.string "available_type"
t.datetime "created_at"
t.datetime "updated_at"
t.integer "nb_total_places"
- t.boolean "destroying", default: false
+ t.boolean "destroying", default: false
end
create_table "availability_tags", force: :cascade do |t|
@@ -92,7 +92,7 @@ ActiveRecord::Schema.define(version: 20170227114634) do
add_index "availability_tags", ["tag_id"], name: "index_availability_tags_on_tag_id", using: :btree
create_table "categories", force: :cascade do |t|
- t.string "name", limit: 255
+ t.string "name"
t.datetime "created_at"
t.datetime "updated_at"
t.string "slug"
@@ -101,7 +101,7 @@ ActiveRecord::Schema.define(version: 20170227114634) do
add_index "categories", ["slug"], name: "index_categories_on_slug", unique: true, using: :btree
create_table "components", force: :cascade do |t|
- t.string "name", limit: 255, null: false
+ t.string "name", null: false
end
create_table "coupons", force: :cascade do |t|
@@ -119,7 +119,7 @@ ActiveRecord::Schema.define(version: 20170227114634) do
create_table "credits", force: :cascade do |t|
t.integer "creditable_id"
- t.string "creditable_type", limit: 255
+ t.string "creditable_type"
t.integer "plan_id"
t.integer "hours"
t.datetime "created_at"
@@ -160,7 +160,7 @@ ActiveRecord::Schema.define(version: 20170227114634) do
add_index "event_themes", ["slug"], name: "index_event_themes_on_slug", unique: true, using: :btree
create_table "events", force: :cascade do |t|
- t.string "title", limit: 255
+ t.string "title"
t.text "description"
t.datetime "created_at"
t.datetime "updated_at"
@@ -198,10 +198,10 @@ ActiveRecord::Schema.define(version: 20170227114634) do
add_index "exports", ["user_id"], name: "index_exports_on_user_id", using: :btree
create_table "friendly_id_slugs", force: :cascade do |t|
- t.string "slug", limit: 255, null: false
- t.integer "sluggable_id", null: false
+ t.string "slug", null: false
+ t.integer "sluggable_id", null: false
t.string "sluggable_type", limit: 50
- t.string "scope", limit: 255
+ t.string "scope"
t.datetime "created_at"
end
@@ -211,17 +211,17 @@ ActiveRecord::Schema.define(version: 20170227114634) do
add_index "friendly_id_slugs", ["sluggable_type"], name: "index_friendly_id_slugs_on_sluggable_type", using: :btree
create_table "groups", force: :cascade do |t|
- t.string "name", limit: 255
+ t.string "name"
t.datetime "created_at"
t.datetime "updated_at"
- t.string "slug", limit: 255
+ t.string "slug"
end
add_index "groups", ["slug"], name: "index_groups_on_slug", unique: true, using: :btree
create_table "invoice_items", force: :cascade do |t|
t.integer "invoice_id"
- t.string "stp_invoice_item_id", limit: 255
+ t.string "stp_invoice_item_id"
t.integer "amount"
t.datetime "created_at"
t.datetime "updated_at"
@@ -234,17 +234,17 @@ ActiveRecord::Schema.define(version: 20170227114634) do
create_table "invoices", force: :cascade do |t|
t.integer "invoiced_id"
- t.string "invoiced_type", limit: 255
- t.string "stp_invoice_id", limit: 255
+ t.string "invoiced_type"
+ t.string "stp_invoice_id"
t.integer "total"
t.datetime "created_at"
t.datetime "updated_at"
t.integer "user_id"
- t.string "reference", limit: 255
- t.string "avoir_mode", limit: 255
+ t.string "reference"
+ t.string "avoir_mode"
t.datetime "avoir_date"
t.integer "invoice_id"
- t.string "type", limit: 255
+ t.string "type"
t.boolean "subscription_to_expire"
t.text "description"
t.integer "wallet_amount"
@@ -258,17 +258,17 @@ ActiveRecord::Schema.define(version: 20170227114634) do
add_index "invoices", ["wallet_transaction_id"], name: "index_invoices_on_wallet_transaction_id", using: :btree
create_table "licences", force: :cascade do |t|
- t.string "name", limit: 255, null: false
+ t.string "name", null: false
t.text "description"
end
create_table "machines", force: :cascade do |t|
- t.string "name", limit: 255, null: false
+ t.string "name", null: false
t.text "description"
t.text "spec"
t.datetime "created_at"
t.datetime "updated_at"
- t.string "slug", limit: 255
+ t.string "slug"
end
add_index "machines", ["slug"], name: "index_machines_on_slug", unique: true, using: :btree
@@ -284,14 +284,14 @@ ActiveRecord::Schema.define(version: 20170227114634) do
create_table "notifications", force: :cascade do |t|
t.integer "receiver_id"
t.integer "attached_object_id"
- t.string "attached_object_type", limit: 255
+ t.string "attached_object_type"
t.integer "notification_type_id"
- t.boolean "is_read", default: false
+ t.boolean "is_read", default: false
t.datetime "created_at"
t.datetime "updated_at"
t.string "receiver_type"
- t.boolean "is_send", default: false
- t.jsonb "meta_data", default: {}
+ t.boolean "is_send", default: false
+ t.jsonb "meta_data", default: {}
end
add_index "notifications", ["notification_type_id"], name: "index_notifications_on_notification_type_id", using: :btree
@@ -360,20 +360,20 @@ ActiveRecord::Schema.define(version: 20170227114634) do
add_index "organizations", ["profile_id"], name: "index_organizations_on_profile_id", using: :btree
create_table "plans", force: :cascade do |t|
- t.string "name", limit: 255
+ t.string "name"
t.integer "amount"
- t.string "interval", limit: 255
+ t.string "interval"
t.integer "group_id"
- t.string "stp_plan_id", limit: 255
+ t.string "stp_plan_id"
t.datetime "created_at"
t.datetime "updated_at"
- t.integer "training_credit_nb", default: 0
- t.boolean "is_rolling", default: true
+ t.integer "training_credit_nb", default: 0
+ t.boolean "is_rolling", default: true
t.text "description"
t.string "type"
t.string "base_name"
- t.integer "ui_weight", default: 0
- t.integer "interval_count", default: 1
+ t.integer "ui_weight", default: 0
+ t.integer "interval_count", default: 1
t.string "slug"
end
@@ -402,11 +402,11 @@ ActiveRecord::Schema.define(version: 20170227114634) do
create_table "profiles", force: :cascade do |t|
t.integer "user_id"
- t.string "first_name", limit: 255
- t.string "last_name", limit: 255
+ t.string "first_name"
+ t.string "last_name"
t.boolean "gender"
t.date "birthday"
- t.string "phone", limit: 255
+ t.string "phone"
t.text "interest"
t.text "software_mastered"
t.datetime "created_at"
@@ -436,7 +436,7 @@ ActiveRecord::Schema.define(version: 20170227114634) do
t.integer "project_id"
t.datetime "created_at"
t.datetime "updated_at"
- t.string "title", limit: 255
+ t.string "title"
t.integer "step_nb"
end
@@ -447,27 +447,27 @@ ActiveRecord::Schema.define(version: 20170227114634) do
t.integer "user_id"
t.datetime "created_at"
t.datetime "updated_at"
- t.boolean "is_valid", default: false
- t.string "valid_token", limit: 255
+ t.boolean "is_valid", default: false
+ t.string "valid_token"
end
add_index "project_users", ["project_id"], name: "index_project_users_on_project_id", using: :btree
add_index "project_users", ["user_id"], name: "index_project_users_on_user_id", using: :btree
create_table "projects", force: :cascade do |t|
- t.string "name", limit: 255
+ t.string "name"
t.text "description"
t.datetime "created_at"
t.datetime "updated_at"
t.integer "author_id"
t.text "tags"
t.integer "licence_id"
- t.string "state", limit: 255
- t.string "slug", limit: 255
+ t.string "state"
+ t.string "slug"
t.datetime "published_at"
end
- add_index "projects", ["slug"], name: "index_projects_on_slug", using: :btree
+ add_index "projects", ["slug"], name: "index_projects_on_slug", unique: true, using: :btree
create_table "projects_components", force: :cascade do |t|
t.integer "project_id"
@@ -507,19 +507,19 @@ ActiveRecord::Schema.define(version: 20170227114634) do
t.datetime "created_at"
t.datetime "updated_at"
t.integer "reservable_id"
- t.string "reservable_type", limit: 255
- t.string "stp_invoice_id", limit: 255
+ t.string "reservable_type"
+ t.string "stp_invoice_id"
t.integer "nb_reserve_places"
end
- add_index "reservations", ["reservable_id", "reservable_type"], name: "index_reservations_on_reservable_id_and_reservable_type", using: :btree
+ add_index "reservations", ["reservable_type", "reservable_id"], name: "index_reservations_on_reservable_type_and_reservable_id", using: :btree
add_index "reservations", ["stp_invoice_id"], name: "index_reservations_on_stp_invoice_id", using: :btree
add_index "reservations", ["user_id"], name: "index_reservations_on_user_id", using: :btree
create_table "roles", force: :cascade do |t|
- t.string "name", limit: 255
+ t.string "name"
t.integer "resource_id"
- t.string "resource_type", limit: 255
+ t.string "resource_type"
t.datetime "created_at"
t.datetime "updated_at"
end
@@ -593,18 +593,18 @@ ActiveRecord::Schema.define(version: 20170227114634) do
create_table "statistic_fields", force: :cascade do |t|
t.integer "statistic_index_id"
- t.string "key", limit: 255
- t.string "label", limit: 255
+ t.string "key"
+ t.string "label"
t.datetime "created_at"
t.datetime "updated_at"
- t.string "data_type", limit: 255
+ t.string "data_type"
end
add_index "statistic_fields", ["statistic_index_id"], name: "index_statistic_fields_on_statistic_index_id", using: :btree
create_table "statistic_graphs", force: :cascade do |t|
t.integer "statistic_index_id"
- t.string "chart_type", limit: 255
+ t.string "chart_type"
t.integer "limit"
t.datetime "created_at"
t.datetime "updated_at"
@@ -613,17 +613,17 @@ ActiveRecord::Schema.define(version: 20170227114634) do
add_index "statistic_graphs", ["statistic_index_id"], name: "index_statistic_graphs_on_statistic_index_id", using: :btree
create_table "statistic_indices", force: :cascade do |t|
- t.string "es_type_key", limit: 255
- t.string "label", limit: 255
+ t.string "es_type_key"
+ t.string "label"
t.datetime "created_at"
t.datetime "updated_at"
- t.boolean "table", default: true
- t.boolean "ca", default: true
+ t.boolean "table", default: true
+ t.boolean "ca", default: true
end
create_table "statistic_sub_types", force: :cascade do |t|
- t.string "key", limit: 255
- t.string "label", limit: 255
+ t.string "key"
+ t.string "label"
t.datetime "created_at"
t.datetime "updated_at"
end
@@ -640,8 +640,8 @@ ActiveRecord::Schema.define(version: 20170227114634) do
create_table "statistic_types", force: :cascade do |t|
t.integer "statistic_index_id"
- t.string "key", limit: 255
- t.string "label", limit: 255
+ t.string "key"
+ t.string "label"
t.boolean "graph"
t.datetime "created_at"
t.datetime "updated_at"
@@ -659,7 +659,7 @@ ActiveRecord::Schema.define(version: 20170227114634) do
create_table "subscriptions", force: :cascade do |t|
t.integer "plan_id"
t.integer "user_id"
- t.string "stp_subscription_id", limit: 255
+ t.string "stp_subscription_id"
t.datetime "created_at"
t.datetime "updated_at"
t.datetime "expired_at"
@@ -678,7 +678,7 @@ ActiveRecord::Schema.define(version: 20170227114634) do
add_index "tags", ["name"], name: "index_tags_on_name", unique: true, using: :btree
create_table "themes", force: :cascade do |t|
- t.string "name", limit: 255, null: false
+ t.string "name", null: false
end
create_table "tickets", force: :cascade do |t|
@@ -693,13 +693,13 @@ ActiveRecord::Schema.define(version: 20170227114634) do
add_index "tickets", ["reservation_id"], name: "index_tickets_on_reservation_id", using: :btree
create_table "trainings", force: :cascade do |t|
- t.string "name", limit: 255
+ t.string "name"
t.datetime "created_at"
t.datetime "updated_at"
t.integer "nb_total_places"
- t.string "slug", limit: 255
+ t.string "slug"
t.text "description"
- t.boolean "public_page", default: true
+ t.boolean "public_page", default: true
end
add_index "trainings", ["slug"], name: "index_trainings_on_slug", unique: true, using: :btree
@@ -754,32 +754,32 @@ ActiveRecord::Schema.define(version: 20170227114634) do
add_index "user_trainings", ["user_id"], name: "index_user_trainings_on_user_id", using: :btree
create_table "users", force: :cascade do |t|
- t.string "email", limit: 255, default: "", null: false
- t.string "encrypted_password", limit: 255, default: "", null: false
- t.string "reset_password_token", limit: 255
+ t.string "email", default: "", null: false
+ t.string "encrypted_password", default: "", null: false
+ t.string "reset_password_token"
t.datetime "reset_password_sent_at"
t.datetime "remember_created_at"
- t.integer "sign_in_count", default: 0, null: false
+ t.integer "sign_in_count", default: 0, null: false
t.datetime "current_sign_in_at"
t.datetime "last_sign_in_at"
- t.string "current_sign_in_ip", limit: 255
- t.string "last_sign_in_ip", limit: 255
- t.string "confirmation_token", limit: 255
+ t.string "current_sign_in_ip"
+ t.string "last_sign_in_ip"
+ t.string "confirmation_token"
t.datetime "confirmed_at"
t.datetime "confirmation_sent_at"
- t.string "unconfirmed_email", limit: 255
- t.integer "failed_attempts", default: 0, null: false
- t.string "unlock_token", limit: 255
+ t.string "unconfirmed_email"
+ t.integer "failed_attempts", default: 0, null: false
+ t.string "unlock_token"
t.datetime "locked_at"
t.datetime "created_at"
t.datetime "updated_at"
- t.boolean "is_allow_contact", default: true
+ t.boolean "is_allow_contact", default: true
t.integer "group_id"
- t.string "stp_customer_id", limit: 255
- t.string "username", limit: 255
- t.string "slug", limit: 255
- t.boolean "is_active", default: true
- t.boolean "invoicing_disabled", default: false
+ t.string "stp_customer_id"
+ t.string "username"
+ t.string "slug"
+ t.boolean "is_active", default: true
+ t.boolean "invoicing_disabled", default: false
t.string "provider"
t.string "uid"
t.string "auth_token"
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 8b5435319..71c1364f5 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -6,14 +6,14 @@ services:
RAILS_ENV: production
RACK_ENV: production
env_file:
- - /home/core/fabmanager/config/env
+ - ${PWD}/config/env
volumes:
- - /home/core/fabmanager/public/assets:/usr/src/app/public/assets
- - /home/core/fabmanager/public/uploads:/usr/src/app/public/uploads
- - /home/core/fabmanager/invoices:/usr/src/app/invoices
- - /home/core/fabmanager/exports:/usr/src/app/exports
- - /home/core/fabmanager/log:/var/log/supervisor
- - /home/core/fabmanager/plugins:/usr/src/app/plugins
+ - ${PWD}/public/assets:/usr/src/app/public/assets
+ - ${PWD}/public/uploads:/usr/src/app/public/uploads
+ - ${PWD}/invoices:/usr/src/app/invoices
+ - ${PWD}/exports:/usr/src/app/exports
+ - ${PWD}/log:/var/log/supervisor
+ - ${PWD}/plugins:/usr/src/app/plugins
depends_on:
- postgres
- redis
@@ -23,19 +23,19 @@ services:
postgres:
image: postgres:9.4
volumes:
- - /home/core/fabmanager/postgresql:/var/lib/postgresql/data
+ - ${PWD}/postgresql:/var/lib/postgresql/data
restart: always
elasticsearch:
image: elasticsearch:1.7
volumes:
- - /home/core/fabmanager/elasticsearch:/usr/share/elasticsearch/data
+ - ${PWD}/elasticsearch:/usr/share/elasticsearch/data
restart: always
redis:
image: redis:3.0
volumes:
- - /home/core/fabmanager/redis:/data
+ - ${PWD}/redis:/data
restart: always
nginx:
@@ -44,9 +44,9 @@ services:
- "80:80"
- "443:443"
volumes:
- - /home/core/fabmanager/config/nginx:/etc/nginx/conf.d
- - /home/core/fabmanager/letsencrypt/etc:/etc/letsencrypt
- - /home/core/fabmanager/log:/var/log/nginx
+ - ${PWD}/config/nginx:/etc/nginx/conf.d
+ - ${PWD}/letsencrypt/etc:/etc/letsencrypt
+ - ${PWD}/log:/var/log/nginx
volumes_from:
- fabmanager:ro
links:
diff --git a/lib/tasks/fablab/fix.rake b/lib/tasks/fablab/fix.rake
index f230f2d47..cc35f5c0b 100644
--- a/lib/tasks/fablab/fix.rake
+++ b/lib/tasks/fablab/fix.rake
@@ -16,5 +16,24 @@ namespace :fablab do
e.save!
end
end
+
+ task rolling_plans: :environment do
+ Plan.where(is_rolling: nil).each do |p|
+ if p.is_rolling.nil? and p.is_rolling != false
+ p.is_rolling = true
+ p.save!
+ end
+ end
+ end
+
+ task new_plans_statistics: :environment do
+ StatisticSubType.where(key: nil).each do |sst|
+ p = Plan.find_by(name: sst.label)
+ if p
+ sst.key = p.slug
+ sst.save!
+ end
+ end
+ end
end
end