nicolas/pic_vert_app
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

reçus 2019

Browse Source
This commit is contained in:
Nicolas Bally 2020-01-05 15:22:57 +01:00
parent fd812a6564
commit 8daf34cff9
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/admin/sheets_controller.rb
View File

@ -19,7 +19,7 @@ class Admin::SheetsController < ApplicationController
def recus
date = Date.today
date = DateTime.new(2018, 1, 1).beginning_of_year
date = DateTime.new(2019, 1, 1).beginning_of_year
@sheet_years = SheetYear.joins(:person).order("people.surname").find(:all, :conditions => ["paid_at >= ? and paid_at <= ?",date ,date.end_of_year])
@donates = Donate.joins(:person).order("people.surname").find(:all, :conditions => ["paid_at >= ? and paid_at <= ?",date ,date.end_of_year])

10
app/views/admin/sheets/index.xls.erb
View File

@ -27,9 +27,9 @@
<Cell><Data ss:Type="String"> Dernier renouvellement </Data></Cell>
<Cell><Data ss:Type="String"> Création de la fiche </Data></Cell>
<Cell><Data ss:Type="String"> mise à jour</Data></Cell>
<Cell><Data ss:Type="String"> Paiement pour 2018</Data></Cell>
<Cell><Data ss:Type="String"> Type d'adhésion pour 2018</Data></Cell>
<Cell><Data ss:Type="String"> Pouvoirs pour 2018</Data></Cell>
<Cell><Data ss:Type="String"> Paiement pour 2019</Data></Cell>
<Cell><Data ss:Type="String"> Type d'adhésion pour 2019</Data></Cell>
<Cell><Data ss:Type="String"> Pouvoirs pour 2019</Data></Cell>
@ -68,8 +68,8 @@
<Cell><Data ss:Type="String"><%= sheet.last_year %></Data></Cell>
<Cell><Data ss:Type="String"><%= l sheet.created_at %></Data></Cell>
<Cell><Data ss:Type="String"><%= l sheet.updated_at %></Data></Cell>
<% if sheet.sheet_years.where(:year => 2018).first %>
<% sy = sheet.sheet_years.where(:year => 2018).first %>
<% if sheet.sheet_years.where(:year => 2019).first %>
<% sy = sheet.sheet_years.where(:year => 2019).first %>
<Cell><Data ss:Type="String"><%= l(sy.paid_at) if sy.paid_at %></Data></Cell>
<Cell><Data ss:Type="String"><%= SheetYear::JOIN_TYPE[sy.join_type] %></Data></Cell>

6
app/views/admin/sheets/recus.html.haml
View File

@ -1,6 +1,6 @@
-price_list = {}
-i = 2
-i = 9
-@sheet_years.each do |sheet_year|
-price_list[sheet_year.amount.to_s] = true
-i += 1
@ -15,7 +15,7 @@
%td{:style => "text-align:right;"}
Numéro d'ordre du reçu
%br
="2018/"+("%04d" % i).to_s
="2019/"+("%04d" % i).to_s
%h2{:style => "text-align:center;"}
Reçu dons aux œuvres
@ -170,7 +170,7 @@
%td{:style => "text-align:right;"}
Numéro d'ordre du reçu
%br
="2018/"+("%04d" % i).to_s
="2019/"+("%04d" % i).to_s
%h2{:style => "text-align:center;"}
Reçu dons aux œuvres