vesr 0.2.1 → 0.3.0

data/app/views/esr_files/_esr_file.html.haml

@@ -0,0 +1,5 @@
+%tr[esr_file]
+  %td= link_to esr_file.updated_at, esr_file
+  %td.currency= esr_file.esr_records.valid.count
+  %td.currency= esr_file.esr_records.invalid.count
+  %td.currency= sprintf("%0.2f", esr_file.esr_records.sum(:amount) || 0.0)

data/app/views/esr_files/_list.html.haml

@@ -0,0 +1,12 @@
+%table.list#esr_file_list
+  %tr   
+    %th= t_attr :updated_at, EsrFile
+    %th.currency= t_attr :bookings, EsrFile
+    %th.currency= t_attr :bad_bookings, EsrFile
+    %th.currency= t_attr :total_amount, EsrFile
+    %th.action-links
+
+  = render @esr_files
+
+  %tr#invoices_list_footer
+    %th{:colspan => 5}= will_paginate @esr_files, :params => {:query => params[:query]}

data/app/views/esr_files/_list_records.html.haml

@@ -0,0 +1,16 @@
+%table.list{:style => "width: 100%"}
+  %tr
+    %th Valuta Datum
+    %th Patient
+    %th Status
+    %th{:style => "text-align: right"} Rechnungsbetrag
+    %th{:style => "text-align: right"} Bezahlbetrag
+    %th{:style => "text-align: right"} Saldo
+  - for esr_record in list_records
+    %tr
+      %td= h esr_record.value_date
+      %td= link_to esr_record.invoice.patient.to_s, esr_record.invoice if esr_record.invoice
+      %td= esr_record.invoice ? link_to(esr_record.remarks, esr_record.invoice) : esr_record.remarks
+      %td{:style => "text-align: right"}= h sprintf("%0.2f", esr_record.invoice.amount.currency_round) if esr_record.invoice
+      %td{:style => "text-align: right"}= h sprintf("%0.2f", esr_record.amount.currency_round)
+      %td{:style => "text-align: right"}= h sprintf("%0.2f", esr_record.invoice.due_amount.currency_round) if esr_record.invoice

data/app/views/esr_files/_sidebar.html.haml

@@ -0,0 +1,6 @@
+- content_for :sidebar do
+  .sub-tabs
+    %h3 Ältere Buchungsläufe
+    %ul
+      - for esr_file in EsrFile.find :all, :limit => 10, :order => 'updated_at DESC'
+        %li= link_to esr_file.to_s(:short), esr_file

data/app/views/esr_files/show.html.haml

@@ -0,0 +1,13 @@
+.contextual
+  = link_to_function "Protokoll drucken", 'window.print()', :class => "icon icon-print"
+  = link_to "VESR Liste", esr_files_path, :class => "icon icon-book"
+%h2
+  VESR Protokoll vom #{l(@esr_file.updated_at.to_date)}
+= render :partial => 'list_records', :object => @esr_file.esr_records.valid
+- unless @esr_file.esr_records.bad.empty?
+  %h3 Falscher Betrag
+  = render :partial => 'list_records', :object => @esr_file.esr_records.bad
+- unless @esr_file.esr_records.missing.empty?
+  %h3 Rechnung nicht gefunden
+  = render :partial => 'list_records', :object => @esr_file.esr_records.missing
+= render :partial => 'sidebar'

data/config/locales/de.yml

@@ -8,6 +8,10 @@ de:
       esr_file:
         remarks:    Bemerkungen
         file:       Dateiname
+        updated_at: Verbucht am
+        bookings:   Buchungen
+        bad_bookings: Fehlerhafte Buchungen
+        total_amount: Total (inkl. fehlerhaft)
       esr_record:
         bank_pc_id:       Teilnehmer-Nr.
         reference:        Referenz

data/lib/vesr/version.rb

@@ -1,3 +1,3 @@
 module Vesr
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vesr
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Roman Simecek
@@ -36,15 +36,12 @@ files:
 - app/models/esr_file.rb
 - app/models/esr_record.rb
 - app/uploaders/esr_file_uploader.rb
-- app/views/esr_bookings/_form.html.erb
-- app/views/esr_bookings/_item.html.erb
-- app/views/esr_bookings/_list_footer.html.erb
-- app/views/esr_bookings/_list_header.html.erb
-- app/views/esr_bookings/_list_records.html.erb
-- app/views/esr_bookings/_navigation_section.html.erb
-- app/views/esr_bookings/_sidebar.html.erb
-- app/views/esr_bookings/list.html.erb
-- app/views/esr_bookings/show.html.erb
+- app/views/esr_files/_esr_file.html.haml
+- app/views/esr_files/_list.html.haml
+- app/views/esr_files/_list_records.html.haml
+- app/views/esr_files/_navigation_section.html.erb
+- app/views/esr_files/_sidebar.html.haml
+- app/views/esr_files/show.html.haml
 - config/locales/de.yml
 - config/routes.rb
 - db/migrate/1_create_vesr_tables.rb

data/app/views/esr_bookings/_form.html.erb

@@ -1,13 +0,0 @@
-<div class="contextual">
-  <%= link_to "VESR Liste", esr_files_path, :class => "icon icon-book" %>
-</div>
-<h2>VESR Datei einlesen</h2>
-<% semantic_form_for :esr_file do |esr_file| %>
-  <%= esr_file.inputs do %>
-    <%= esr_file.input :file %>
-    <%= esr_file.input :file_cache, :as => :hidden %>
-  <%- end %>
-  <%= esr_file.buttons do %>
-    <%= esr_file.commit_button %>
-  <%- end %>
-<% end %>

data/app/views/esr_bookings/_item.html.erb

@@ -1,6 +0,0 @@
-<tr id="esr_file_<%= item.id %>">
-  <td><%= link_to l(item.updated_at), esr_booking_path(item) %></td>
-  <td style="text-align: right"><%=h item.esr_records.valid.count %></td>
-  <td style="text-align: right"><%=h item.esr_records.invalid.count %></td>
-  <td style="text-align: right"><%=h sprintf("%0.2f", item.esr_records.sum(:amount) || 0.0) %></td>
-</tr>

data/app/views/esr_bookings/_list_footer.html.erb

@@ -1,3 +0,0 @@
-<tr>
-  <th colspan="5" style="text-align: right"><%= will_paginate @esr_files, :params => {:query => params[:query]} %></th>
-</tr>

data/app/views/esr_bookings/_list_header.html.erb

@@ -1,7 +0,0 @@
-<tr>
-  <th>Verbucht am</th>
-  <th>Buchungen</th>
-  <th>Fehlerhafte Buchungen</th>
-  <th style="text-align: right">Total (inkl. fehlerh.)</th>
-  <th/>
-</tr>

data/app/views/esr_bookings/_list_records.html.erb

@@ -1,21 +0,0 @@
-<table class="list" style="width: 100%">
-<tr>
-  <th>Valuta Datum</th>
-  <th>Patient</th>
-  <th>Status</th>
-  <th style="text-align: right">Rechnungsbetrag</th>
-  <th style="text-align: right">Bezahlbetrag</th>
-  <th style="text-align: right">Saldo</th>
-</tr>
-
-<% for esr_record in list_records %>
-  <tr>
-    <td><%=h esr_record.value_date %></td>
-    <td><%= link_to esr_record.invoice.patient.to_s, esr_record.invoice if esr_record.invoice %></td>
-    <td><%= esr_record.invoice ? link_to(esr_record.remarks, esr_record.invoice) : esr_record.remarks %></td>
-    <td style="text-align: right"><%=h sprintf("%0.2f", esr_record.invoice.amount.currency_round) if esr_record.invoice %></td>
-    <td style="text-align: right"><%=h sprintf("%0.2f", esr_record.amount.currency_round) %></td>
-    <td style="text-align: right"><%=h sprintf("%0.2f", esr_record.invoice.due_amount.currency_round) if esr_record.invoice %></td>
-  </tr>
-<% end %>
-</table>

data/app/views/esr_bookings/_sidebar.html.erb

@@ -1,10 +0,0 @@
-<% content_for :sidebar do %>
-<div class="sub-tabs">
-  <h3>Ältere Buchungsläufe</h3>
-  <ul>
-    <% for esr_file in EsrFile.find :all, :limit => 10, :order => 'updated_at DESC' %>
-      <li><%= link_to esr_file.to_s(:short), esr_booking_path(esr_file) %></li>
-    <% end %>
-  </ul>
-</div>
-<% end %>

data/app/views/esr_bookings/list.html.erb

@@ -1,14 +0,0 @@
-<div class="contextual">
-  <%= link_to "VESR Datei einlesen", new_esr_booking_path, :class => "icon icon-book" %>
-</div>
-
-<h2>VESR Buchungsläufe</h2>
-<div id="vesr_list">
-  <table class="list">
-    <%= render :partial => 'esr_bookings/list_header' %>
-    <%= render :partial => 'esr_bookings/item', :collection => @esr_files %>
-    <%= render :partial => 'esr_bookings/list_footer' %>
-  </table>
-</div>
-
-<%= render :partial => 'sidebar' %>

data/app/views/esr_bookings/show.html.erb

@@ -1,18 +0,0 @@
-<div class="contextual">
-  <%= link_to_function "Protokoll drucken", 'window.print()', :class => "icon icon-print" %>
-  <%= link_to "VESR Liste", esr_bookings_path, :class => "icon icon-book" %>
-</div>
-<h2>VESR Protokoll vom <%= l(@esr_file.updated_at.to_date) %></h2>
-<%= render :partial => 'list_records', :object => @esr_file.esr_records.valid %>
-
-<% unless @esr_file.esr_records.bad.empty? %>
-  <h3>Falscher Betrag</h3>
-  <%= render :partial => 'list_records', :object => @esr_file.esr_records.bad %>
-<% end %>
-
-<% unless @esr_file.esr_records.missing.empty? %>
-  <h3>Rechnung nicht gefunden</h3>
-  <%= render :partial => 'list_records', :object => @esr_file.esr_records.missing %>
-<% end %>
-
-<%= render :partial => 'sidebar' %>