Skip to content
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

created an accordion style dropdown for each round #104

Merged
merged 4 commits into from
Mar 6, 2019
Merged

created an accordion style dropdown for each round #104

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d788e33
created an accordion style dropdown for each round
Meleeman01 Jan 26, 2019
19af682
rounds now older than 1 year are hidden by default
Meleeman01 Feb 1, 2019
aeae724
rounds older than 1 year from current day are now hidden by default
Meleeman01 Feb 2, 2019
3579140
updated code to use diffInYears and fixed conditional.
Meleeman01 Mar 6, 2019
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
14 changes: 14 additions & 0 deletions laravel/resources/js/applications.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
//for applications list page;

var $ = require('wetfish-basic');

$(document).ready(function()
{
$('.appTitle').each(function()
{
$(this).on('click', function()
{
$(this.nextElementSibling).toggle('hidden');
});
});
});
1 change: 1 addition & 0 deletions laravel/resources/js/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ require('./ajax');
require('./alerts');
require('./menu');
require('./scores');
require('./applications');
16 changes: 13 additions & 3 deletions laravel/resources/views/pages/applications/list.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,25 @@
<?php
use Carbon\Carbon;
?>
@extends('app')

@section('content')
<h1>All Applications
@if(in_array(Auth::user()->role, ['admin']))
@if(in_array(Auth::user()->role, ['admin']))
<div class="pull-right" style="font-size:0.4em; margin-top: 1.4em;"><a href="/recalcscores">Recalculate Scores</a></div>
@endif
</h1>
@foreach($rounds as $round)
<hr>
<h2> {{ $round->name }} </h2>
<div class="scrollable">
<h2 class="appTitle"> {{ $round->name }} </h2>

<!--check to see if the round end_date is a year old from today-->

@if(Carbon::parse($round->end_date)->diffInDays(Carbon::now())==365)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Um, wouldn't this only work if the difference in days is exactly 365?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

interestingly enough it works regardless when using diffInYears(), but i think thats something that could be made more clear as well. I tested both and they work.

<div class="scrollable hidden">
@else
<div class="scrollable">
@endif
<table class="table table-hover table-striped">
<thead>
<tr>
Expand Down