dorsale 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30e7a95b3a14cfbc8de6ec2a68581fee02e9e717
-  data.tar.gz: dcf2a66b6c5c408432ab8099b19ad15ca6cbfcfc
+  metadata.gz: 3b10a77c06f576e9759135845451785c4a3788ab
+  data.tar.gz: 03cdb0e99e8efe2f82775779200f25825813b959
 SHA512:
-  metadata.gz: f1d9fce438bb571633b42af218c096954d11c94df504a80eebe9c82b43fda145ccd749dae19c296926081e57050cae6eca76b0fe137ec4bb6b52c9f9cdae7c3b
-  data.tar.gz: 4fc14f28385ac5be5242f7fb66c77bf7c5373a92eed689989535f9fc242aeacb3ff02368339cbaf5ef84bc0ff2f1addafa54a2bb9a524fd3106a270f9becd7f5
+  metadata.gz: 6580b3c4bf6c3d90b0b46911288a0afe718d3667434d416203c4398699a29ccf4c83334787625b0ed5bf70d37791559d55b046c824124f96f9c7bc87addd35e0
+  data.tar.gz: 06af38e2b8ea145e5ae2e84826c2ba9beab4f49909472bccdf795dc94a7cc92cf1287c32a4739ba449a62b0958a9f35dfc7f456fd742e6748baea2445caf59ce

data/app/controllers/dorsale/flyboy/concerns/tasks_summary.rb

@@ -0,0 +1,17 @@
+module Dorsale
+  module Flyboy
+    module TasksSummaryConcern
+      extend ActiveSupport::Concern
+
+      def setup_tasks_summary
+        tasks = current_user_scope.tasks.where("(owner_id is null and owner_type is null) or (owner_id = ? and owner_type = ?)", current_user.id, current_user.class.name)
+        @delayed_tasks   = tasks.delayed
+        @today_tasks     = tasks.today
+        @tomorrow_tasks  = tasks.tomorrow
+        @this_week_tasks = tasks.this_week
+        @next_week_tasks = tasks.next_week
+      end
+
+    end
+  end
+end

data/app/controllers/dorsale/flyboy/tasks_controller.rb

@@ -1,6 +1,8 @@
 module Dorsale
   module Flyboy
     class TasksController < ::Dorsale::Flyboy::ApplicationController
+      include Dorsale::Flyboy::TasksSummaryConcern
+
       before_action :set_objects, only: [
         :show,
         :edit,
@@ -156,6 +158,10 @@ module Dorsale
         redirect_to dorsale.flyboy_tasks_path
       end
 
+      def summary
+        setup_tasks_summary
+      end
+
       private
 
       def set_objects

data/app/helpers/dorsale/flyboy/application_helper.rb

@@ -25,6 +25,10 @@ module Dorsale
         render "dorsale/flyboy/tasks/tasks_for_taskable", tasks: tasks, taskable: taskable
       end
 
+      def show_tasks_summary
+        render "dorsale/flyboy/tasks/summary"
+      end
+
       def task_color(task)
         return "finished" if task.done
         return "ontime"   if task.reminder > Date.today

data/app/views/dorsale/flyboy/_filters.html.slim

@@ -4,9 +4,9 @@
     .form-group
       label.sr-only for="status" Status
       select.form-control name="filters[status]"
-        option value="" Tous les status
-        option value="open" selected=(@filters.get("status") == "open") = "Ouvert"
-        option value="closed" selected=(@filters.get("status") == "closed") = "Fermé"
+        option value="" = t("messages.folders.status.all")
+        option value="open" selected=(@filters.get("status") == "open") = t("messages.folders.status.open")
+        option value="closed" selected=(@filters.get("status") == "closed") = t("messages.folders.status.closed")
 
     = filter_reset_button
     = filter_submit_button

data/app/views/dorsale/flyboy/folders/_form.html.slim

@@ -3,12 +3,12 @@
     = context_icon :tasks
 
     - if @folder.persisted?
-      = context_title "Modifier #{@folder.name}"
+      = context_title(t("update") + " " + @folder.name)
       - if can?(:delete, @folder)
         = delete_button dorsale.flyboy_folder_path(@folder)
 
     - else
-      = context_title "Nouveau dossier"
+      = context_title t('messages.folders.title_create')
 
 
 - content_for :main do

data/app/views/dorsale/flyboy/folders/_list.html.slim

@@ -8,7 +8,7 @@ table
       th.hidden-xs
         = sortable_column Dorsale::Flyboy::Folder.t(:status), column: "status"
       th
-        = t ".actions", default: t("helpers.actions")
+        = t("actions.actions")
 
   tbody
     - folders.each do |folder|

data/app/views/dorsale/flyboy/tasks/_form.html.slim

@@ -3,12 +3,12 @@
     = context_icon :check_square_o
 
     - if @task.persisted?
-      = context_title "Modifier #{@task.name}"
+      = context_title (t("update") + " " + @task.name)
       - if can?(:delete, @task)
         = delete_button dorsale.flyboy_task_path(@task)
 
     - else
-      = context_title "Nouvelle tâche"
+      = context_title t('messages.folders.new_task')
 
   - if can?(:read, @task.taskable)
     = render "#{@task.taskable.class.to_s.tableize}/context", taskable: @task.taskable

data/app/views/dorsale/flyboy/tasks/_summary.html.slim

@@ -0,0 +1,10 @@
+- if @delayed_tasks.any?
+    = render 'dorsale/flyboy/tasks/summary_list', tasks: @delayed_tasks, title: t("datetime.delayed")
+- if @today_tasks.any?
+    = render 'dorsale/flyboy/tasks/summary_list', tasks: @today_tasks, title: t("datetime.today")
+- if @tomorrow_tasks.any?
+    = render 'dorsale/flyboy/tasks/summary_list', tasks: @tomorrow_tasks, title: t("datetime.tomorrow")
+- if @this_week_tasks.any?
+    = render 'dorsale/flyboy/tasks/summary_list', tasks: @this_week_tasks, title: t("datetime.this_week")
+- if @next_week_tasks.any?
+    = render 'dorsale/flyboy/tasks/summary_list', tasks: @next_week_tasks, title: t("datetime.next_week")

data/app/views/dorsale/flyboy/tasks/_summary_list.html.slim

@@ -0,0 +1,25 @@
+.task-group
+  h3 = title
+  table.default
+    thead
+      tr
+        th.taskable = ::Dorsale::Flyboy::Task.t(:taskable)
+        th.name     = ::Dorsale::Flyboy::Task.t
+        th.date     = ::Dorsale::Flyboy::Task.t(:date)
+    tbody
+      - tasks.each do |task|
+        tr
+          td.taskable
+            a href=engine_polymorphic_path(task.taskable)
+              = task.taskable.name
+
+          td.name
+            - if task.owner.nil?
+              = icon(:question)
+            - else
+              = icon(:user)
+
+            = link_to task.name, dorsale.flyboy_task_path(task)
+
+          td.date
+            .text-muted = date(task.term)

data/app/views/dorsale/flyboy/tasks/summary.html.slim

@@ -0,0 +1,3 @@
+h1 Tasks summary
+
+= render 'dorsale/flyboy/tasks/summary'

data/config/locales/alexandrie.en.yml

@@ -0,0 +1,8 @@
+en:
+  messages:
+    attachments:
+      create_ok    : "File successfully created."
+      create_error : "One error occurs, file not created."
+      delete_ok    : "File deleted."
+      delete_error : "Impossible to delete the file."
+      no_file_selected: "No file selected."

data/config/locales/billing_machine.en.yml

@@ -0,0 +1,50 @@
+en:
+  activerecord:
+    models:
+      dorsale/billing_machine/invoice: "invoice"
+      dorsale/billing_machine/quotation: "quotation"
+      dorsale/billing_machine/id_card: "id card"
+      dorsale/billing_machine/payment_term: "payment term"
+
+    attributes:
+      dorsale/billing_machine/id_card:
+        id_card_name: "id card name"
+        entity_name: "entity name"
+        intracommunity_vat: "intracommunity VAT"
+        legal_form: "legal form"
+        registration_number: "registration number"
+        registration_city: "registration city"
+        contact_full_name: "contact name"
+        contact_fax: "contact fax number"
+        contact_email: "contact email"
+        contact_phone: "contact phone"
+        contact_address_1: "contact address (1)"
+        contact_address_2: "contact address (2)"
+        contact_zip: "contact zip"
+        contact_city: "contact city"
+        bank_name: "bank name"
+        bank_address: "bank address"
+        siret: "siret"
+        capital: "capital"
+        address1: "adress (1)"
+        address2: "adress (2)"
+        zip: "zip"
+        city: "city"
+        phone: "phone"
+        iban: "iban"
+        bic_swift: "BIC/SWIFT"
+        ape_naf: "APE/NAF"
+        custom_info_1: "custom informations (1)"
+        custom_info_2: "custom informations (2)"
+        custom_info_3: "custom informations (3)"
+        logo: "logo"
+
+  messages:
+    invoices:
+      create_ok : "Invoice successfully created."
+      update_ok : "Invoice successfully updated."
+      pay_ok    : "This invoice has been marked payed."
+      pay_error : "Impossible to mark this invoice as payed."
+    quotations:
+      create_ok : "Quotation successfully created."
+      update_ok : "Quotation successfully created."

data/config/locales/billing_machine.fr.yml

@@ -15,8 +15,8 @@ fr:
         registration_number: "numéro d'immatriculation"
         registration_city: "ville d'immatriculation"
         contact_full_name: "nom du contact"
-        contact_fax: "email du contact"
-        contact_email: "nom du contact"
+        contact_fax: "fax du contact"
+        contact_email: "email du contact"
         contact_phone: "téléphone du contact"
         contact_address_1: "adresse du contact (1)"
         contact_address_2: "adresse du contact (2)"

data/config/locales/common.en.yml

@@ -0,0 +1,144 @@
+en:
+  "yes"   : "Yes"
+  "no"    : "No"
+  "true"  : "Yes"
+  "false" : "No"
+
+  actions: &actions
+    actions    : "Actions"
+    index      : "Index"
+    list       : "List"
+    new        : "New"
+    create     : "Create"
+    read       : "Read"
+    show       : "Show"
+    details    : "Détails"
+    edit       : "Edit"
+    update     : "Update"
+    delete     : "Delete"
+    destroy    : "Destroy"
+    add        : "Add"
+    filter     : "Filter"
+    filter_by  : "Filter by"
+    sort       : "Sort"
+    sort_by    : "Sort by"
+    reset      : "Reset"
+    back       : "Back"
+    save       : "Save"
+    open       : "Open"
+    close      : "Close"
+    lock       : "Lock"
+    unlock     : "Unlock"
+    snooze     : "Snooze"
+    alert      : "Alert"
+    complete   : "Complete"
+    done       : "Done"
+    download   : "Download"
+    upload     : "Upload"
+    preview    : "Preview"
+    confirm    : "Confirm this action ?"
+    cancel     : "Cancel"
+    search     : "Search"
+    sign_in    : "Sign in"
+    signin     : "Sign in"
+    log_in     : "Log in"
+    login      : "Log in"
+    sign_out   : "Sign out"
+    signout    : "Sign out"
+    log_out    : "Log out"
+    logout     : "Log out"
+    sign_up    : "Sign up"
+    signup     : "Sign up"
+    browse     : "Browse"
+    cut        : "Cut"
+    copy       : "Copy"
+    paste      : "Paste"
+    duplicate  : "Duplicate"
+    export     : "Export"
+    export_csv : "Export CSV"
+    export_xls : "Export XLS"
+    export_pdf : "Export PDF"
+    import     : "Import"
+    import_csv : "Import CSV"
+    import_xls : "Import XLS"
+    import_pdf : "Import PDF"
+    send       : "Send"
+    comment    : "Comment"
+    add_line   : "Add line"
+    remove_line: "Remove line"
+    pay        : "Pay"
+    paid       : "Payd"
+    continue   : "Continue"
+
+  attributes: &attributes
+    id                    : "Id"
+    code                  : "Code"
+    reference             : "Réference"
+    created_at            : "Created at"
+    updated_at            : "Updated at"
+    name                  : "Name"
+    title                 : "Title"
+    label                 : "Label"
+    first_name            : "First name"
+    last_name             : "Last name"
+    email                 : "E-mail"
+    www                   : "Web site"
+    phone                 : "Phonr"
+    mobile                : "Mobile"
+    fax                   : "Fax"
+    password              : "Password"
+    password_confirmation : "Password (confirm)"
+    description           : "Description"
+    text                  : "Text"
+    date                  : "Date"
+    state                 : "State"
+    status                : "Status"
+    file                  : "File"
+    address               : "Address"
+    address1              : "Address"
+    address2              : "Address (rest)"
+    street                : "Address"
+    street_bis            : "Address (rest)"
+    zip                   : "Zip"
+    city                  : "City"
+    country               : "Country"
+    tags                  : "Tags"
+    tag_list              : "Tags"
+    budget                : "Budget"
+    probability           : "Probability"
+    access                : "Access"
+    color                 : "Color"
+    data                  : "Data"
+    comment               : "Comment"
+    written_by            : "Written by"
+    details               : "Datails"
+    quantity              : "Quantity"
+    due_date              : "Due date"
+    paid                  : "Paid ?"
+    customer              : "Customer"
+    customer_guid         : "Customer"
+    tracking_id           : "Tracking ID"
+    count                 : "Number"
+    length                : "Number"
+    number                 : "Number"
+    message               : "Message"
+
+    # BillingMachine
+    unit                  : "Unit"
+    unit_price            : "Unit price"
+    payment_term          : "Payment term"
+    payment_term_id       : "Payment term"
+    vat_rate              : "VAT rate"
+    vat_amount            : "VAT amount"
+    advance               : "Advance"
+    total_duty            : "Total duty"
+    total_all_taxes       : "Total all taxes"
+    balance               : "Balance"
+    expires_at            : "Expires at"
+
+  errors:
+    messages:
+      extension_white_list_error : "This file type is not supported"
+
+  labels:
+    <<: *attributes

data/config/locales/common.fr.yml

@@ -120,7 +120,7 @@ fr:
     tracking_id           : "Numéro"
     count                 : "Nombre"
     length                : "Nombre"
-    numer                 : "Nombre"
+    number                 : "Nombre"
     message               : "Message"
 
     # BillingMachine

data/config/locales/customer_vault.en.yml

@@ -0,0 +1,69 @@
+en:
+  customer_vault: "Directory"
+
+  sections:
+    activity: "Activity"
+    links: "Links"
+    tasks: "Tasks"
+    people: "People"
+
+  messages:
+    no_people: "No people find."
+    no_activity: "No recent activity."
+
+    corporations:
+      create_ok    : "Corporation created."
+      update_ok    : "Corporation updated."
+      delete_ok    : "Corporation deleted."
+      delete_error : "One error occurs, corporation not deleted."
+
+    individuals:
+      create_ok    : "Individual created."
+      update_ok    : "Individual updated."
+      delete_ok    : "Individual deleted."
+      delete_error : "One error occurs, person not deleted."
+
+    links:
+      create_ok    : "Link created."
+      update_ok    : "Link updated."
+      delete_ok    : "Link deleted."
+      delete_error : "One error occurs, link not deleted."
+
+  actions:
+    activity: "Activity"
+    new_individual: "New individual"
+    new_corporation: "New corporation"
+    new_link: "New link"
+    new_comment: "New comment"
+    new_task: "New task"
+
+  activerecord:
+    models:
+      dorsale/customer_vault/person:
+        one: "Person"
+        other: "People"
+      dorsale/customer_vault/corporation:
+        one: "Corporation"
+        other: "Corporations"
+      dorsale/customer_vault/individual:
+        one: "Individual"
+        other: "Individuals"
+      dorsale/customer_vault/link:
+        one: "Link"
+        other: "Links"
+
+    attributes:
+      dorsale/customer_vault/person: &customer_vault_person_attributes
+        context: "Context"
+        all_tags: "All tags"
+        capital: "Capital"
+        immatriculation_number_1: "Immatriculation number 1"
+        immatriculation_number_2: "Immatriculation number 2"
+        legal_form: "Legal form"
+      dorsale/customer_vault/individual:
+        <<: *customer_vault_person_attributes
+      dorsale/customer_vault/corporation:
+        <<: *customer_vault_person_attributes
+      dorsale/customer_vault/link:
+        alice: "Person"
+        bob: "Person"