Skip to content

institution edits date range #177

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rodrigoassis wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

institution edits date range #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions app/assets/javascripts/stats.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,23 @@
$(document).ready(function(){
$('#institution_id').change(function(){
var id = $(this).val()
loadStatsForInstitution(id)
})
loadStatsForInstitution();
});

$('#start_date, #end_date').change(function() {
loadStatsForInstitution();
});

function loadStatsForInstitution(){
var institutionId = $("#institution_id").val() || 0
let start_date = $("#start_date").val() || 0;
let end_date = $("#end_date").val() || 0;

function loadStatsForInstitution(institutionId){
id = institutionId || 0
$.ajax({
url: "/admin/stats/" + id + "/institution"
url: "/admin/stats/" + institutionId + "/institution",
data: {
start_date: start_date,
end_date: end_date
},
});
}
})
12 changes: 11 additions & 1 deletion app/controllers/admin/stats_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,16 @@ def index

def institution
id = params[:id] ||= 0
@stats = StatsService.new(current_user).transcript_edits(id)
@stats = StatsService.new(current_user, start_date, end_date).transcript_edits(id)
end

private

def start_date
params[:start_date].to_i > 0 ? params[:start_date] : nil
end

def end_date
params[:end_date].to_i > 0 ? params[:end_date] : nil
end
end
38 changes: 26 additions & 12 deletions app/views/admin/stats/_edit_stats.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,33 @@
<h3>Institution edits</h3>
<div class="card mb-2">
<div class="card-header heading">
</div>
<div class="card-header heading"></div>
<div class="card-body">
<form>
<p>Institution:
<%= collection_select(:institution, :id, institutions,
:id, :name,
include_blank: 'Select an institution') %>
</p>
<div class="row">
<div class="col">
<div class="form-group">
<label for="institution">Institution:</label>
<%= collection_select(:institution, :id, institutions, :id, :name, include_blank: 'Select an institution') %>
</div>
</div>
</div>
<div class="row">
<div class="col">
<div class="form-group">
<label for="start_date">Start date:</label>
<input type="date" id="start_date" class="form-control">
</div>
</div>
</div>
<div class="row">
<div class="col">
<div class="form-group">
<label for="end_date">End date:</label>
<input type="date" id="end_date" class="form-control">
</div>
</div>
</div>
</form>

<div class="sums" id="edits_for_institution">
</div>
<div class="sums" id="edits_for_institution"></div>
</div>
</div>


1 change: 0 additions & 1 deletion app/views/admin/stats/_stat_list.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@
<div class="sum-value"><%= value[_key].to_i %> </div>
</div>
<% end %>