1
0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-02-20 14:54:15 +01:00

Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev

This commit is contained in:
Nicolas Florentin 2023-09-27 15:41:12 +02:00
commit 7cbf75c37f
4 changed files with 9 additions and 3 deletions

View File

@ -4,9 +4,12 @@
- Fix a bug: unable to sync projects with openprojects
- Fix a bug: public availabilities (no user) was buggy (server error)
- Fix a bug: unable to generate statistic
- [TODO DEPLOY] `rails fablab:openlab:bulk_export`
- [TODO DEPLOY] `rails fablab:openlab:bulk_update`
- [TODO DEPLOY] `rails fablab:es:build_stats`
- [TODO DEPLOY] `rails fablab:maintenance:regenerate_statistics[2023,6]`
## v6.1.0 2023 September 25

View File

@ -39,6 +39,10 @@
grid-template-columns: repeat(auto-fill, minmax(290px, 1fr));
gap: 3.2rem;
& > span { grid-column: 1/-1;}
& > a {
grid-column: 1/-1;
justify-self: center;
}
}
@media (min-width: 1200px) {

View File

@ -126,8 +126,7 @@
<p class="name">{{project.name}}</p>
<span class="openlab" ng-if="openlab.searchOverWholeNetwork"><i class="fa fa-tag"></i> {{ project.app_name }}</span>
</div>
</div>
<a class="btn btn-warning" ng-click="loadMore()" ng-if="projectsPagination.hasNextPage()" translate>{{ 'app.public.projects_list.load_next_projects' }}</a>
<a class="fab-button is-secondary" ng-click="loadMore()" ng-if="projectsPagination.hasNextPage()" translate>{{ 'app.public.projects_list.load_next_projects' }}</a>
</div>
</section>

View File

@ -17,7 +17,7 @@ class Statistics::BuilderService
private
def default_options
yesterday = Time.current
yesterday = 1.day.ago
{
start_date: yesterday.beginning_of_day,
end_date: yesterday.end_of_day