Merge pull request #10 from Rumperuu/feature/experience-timeline

Add experience timeline Page Template
This commit is contained in:
Ben Goldsworthy 2021-01-09 13:06:56 +00:00 committed by GitHub
commit 9704bdb41b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 157 additions and 129 deletions

18
.gitignore vendored
View file

@ -1,18 +1,2 @@
*.log *.log
wp-config.php plugins/
wp-content/advanced-cache.php
wp-content/backup-db/
wp-content/backups/
wp-content/blogs.dir/
wp-content/cache/
wp-content/upgrade/
wp-content/uploads/
wp-content/wp-cache-config.php
wp-content/plugins/hello.php
/.htaccess
/license.txt
/readme.html
/sitemap.xml
/sitemap.xml.gz

View file

@ -0,0 +1,145 @@
<?php
/*
* Template Name: Experience Timeline
* /
/**
* The template for displaying all single posts and attachments
*
* @package WordPress
* @subpackage Twenty_Sixteen
* @since Twenty Sixteen 1.0
*/
get_header(); ?>
<?php
function withinDates( $jSDate, $jEDate ) {
$endYear = date( 'Y' );
$endDate = $endYear . '-12-31';
$startDate = ( $endYear - 2 ) . '-01-01';
$jEDate = ( ! $jEDate ) ? date( 'Y-m-d' ) : ( ( $jEDate > $endDate ) ? $endDate : $jEDate );
return ( ( ( strtotime( $jSDate ) < strtotime( $endDate ) ) && ( strtotime( $jSDate ) > strtotime( $startDate ) ) ) && ( strtotime( $jEDate ) > strtotime( $startDate ) ) );
}
$args = array(
'post_type' => array(
'job',
),
'posts_per_page' => -1,
);
$loop = new WP_Query( $args );
?>
<div id="experience-wrapper" class="content-area col-10 col-m-12">
<header class="post-header-title">
<h1 id="page-title">Experience</h1>
<h2 id="page-subtitle">or, a brief history of Ben</h2>
<?php
while ( have_posts() ) :
the_post();
?>
<div class="entry-content tile" id="taxonomy-description">
<?php the_content(); ?>
</div>
<div style="width: 70%; margin: auto; margin-top: 20px; border: 2px dashed #020202; padding: 20px; border-radius: 25px;" class="entry-content tile" id="settings">
<h3 style="margin-bottom: 14px;" class="subheading">Settings</h3>
<form action="/experience-timeline" id="settings" method="GET">
<input class="checkbox" type="checkbox" id="separate" value="separate" checked="checked">
<label for="separate">Separate past and current roles</label>
<input class="ui-button ui-widget ui-corner-all" id="refresh" type="submit" value="Refresh">
</form>
</div>
<?php endwhile; ?>
</header>
<div id="primary" class="content-area">
<main id="company-main" class="site-main" role="main">
<link rel="stylesheet" href="//code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">
<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
<script type="text/javascript" src="https://www.gstatic.com/charts/loader.js"></script>
<script type="text/javascript">
jQuery(document).ready(function($) {
$('input:checkbox').checkboxradio();
$('.refresh').button();
google.charts.load('current', {'packages':['timeline']});
google.charts.setOnLoadCallback(drawChart);
$('input[type="checkbox"]').change(function() {
alert("Feature in progress");
$('#refresh').css('border-width', '5px');
});
$('#refresh').click(function(event) {
$(this).css('border-width', '1px');
event.preventDefault();
drawChart();
});
});
function drawChart() {
var container = document.getElementById('timeline');
var chart = new google.visualization.Timeline(container);
var dataTable = new google.visualization.DataTable();
dataTable.addColumn({ type: 'string', id: 'Type' });
dataTable.addColumn({ type: 'string', id: 'Role' });
dataTable.addColumn({ type: 'string', role: 'tooltip', 'p': {'html': true} });
dataTable.addColumn({ type: 'date', id: 'Start' });
dataTable.addColumn({ type: 'date', id: 'End' });
dataTable.addRows([
<?php
while ( $loop->have_posts() ) :
$loop->the_post();
?>
<?php
$isCurrent = ( get_post_meta( get_the_ID(), 'end-date', true ) ) ? false : true;
$company = wp_get_object_terms(
get_the_ID(),
'company',
array(
'fields' => 'names',
)
);
$title = html_entity_decode( get_the_title() );
$start = get_the_date();
$end = ( ! get_post_meta( get_the_ID(), 'end-date', true ) ) ? date( 'c' ) : get_post_meta( get_the_ID(), 'end-date', true );
?>
[
'<?php echo ( $isCurrent ) ? 'Current' : 'Past'; ?>',
'<?php echo $title . ', ' . html_entity_decode( $company[0] ); ?>',
'<div style="padding: 20px"><h1 class="timeline-entry-title"><?php echo $title; ?></h1><h2><?php echo html_entity_decode( $company[0] ); ?></h2><ul><li><?php echo $start; ?>&mdash;<?php echo ( $isCurrent ) ? 'present' : $end; ?></li></ul></div>',
new Date('<?php echo $start; ?>'),
new Date('<?php echo $end; ?>')
],
<?php endwhile; ?>
]);
var rowHeight = 15;
var chartHeight = dataTable.getNumberOfRows() * rowHeight + 50;
var options = {
tooltip: {isHtml: true},
timeline: {
showRowLabels: true,
},
height: chartHeight,
width: window.innerWidth - 200,
};
chart.draw(dataTable, options);
}
</script>
<div id="slider-range"></div>
<section id="timeline">
<div class="row">
<div id="timeline" class="col-12">
<img class="loading" src="/wp-content/uploads/2016/12/ajax-loader.gif">
</div>
</div>
</section>
</main>
</div>
</div>
<?php // get_sidebar(); ?>
<?php get_footer(); ?>

View file

@ -988,6 +988,10 @@ body > header h1 {
} }
} }
#timeline h1.timeline-entry-title {
font-size: 1.2em;
}
#comments-list-title, #comments-reply-title { #comments-list-title, #comments-reply-title {
font-size: 1.6em; font-size: 1.6em;
margin-bottom: 0.5em; margin-bottom: 0.5em;

View file

@ -32,13 +32,13 @@
<script type="text/javascript" src="https://www.gstatic.com/charts/loader.js"></script> <script type="text/javascript" src="https://www.gstatic.com/charts/loader.js"></script>
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script> <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
<script type="text/javascript"> <script type="text/javascript">
google.charts.load('current', {'packages':['timeline']}); google.charts.load('current', {'packages':['timeline']});
<?php if ( $loop->have_posts() ) : ?> <?php if ( $loop->have_posts() ) : ?>
google.charts.setOnLoadCallback(drawChart); google.charts.setOnLoadCallback(drawChart);
<?php endif; ?> <?php endif; ?>
function drawChart() { function drawChart() {
var container = document.getElementById('timeline'); var container = document.getElementById('timeline');
var chart = new google.visualization.Timeline(container); var chart = new google.visualization.Timeline(container);
var dataTable = new google.visualization.DataTable(); var dataTable = new google.visualization.DataTable();
@ -66,7 +66,7 @@
$title = html_entity_decode( get_the_title() ); $title = html_entity_decode( get_the_title() );
$start = get_the_date(); $start = get_the_date();
$end = ( ! get_post_meta( get_the_ID(), 'end-date', true ) ) ? date( 'D M d Y H:i:s O' ) : get_post_meta( get_the_ID(), 'end-date', true ); $end = ( ! get_post_meta( get_the_ID(), 'end-date', true ) ) ? date( 'c' ) : get_post_meta( get_the_ID(), 'end-date', true );
echo "[ '" . html_entity_decode( $companies[ $lowestDepthCompany ]->name ) . "', '$title', new Date('$start'), new Date('$end') ],\n"; echo "[ '" . html_entity_decode( $companies[ $lowestDepthCompany ]->name ) . "', '$title', new Date('$start'), new Date('$end') ],\n";
endwhile; endwhile;
?> ?>
@ -75,7 +75,7 @@
// Draws the table, then resizes the element height and re-draws it // Draws the table, then resizes the element height and re-draws it
// to avoid needing to scroll vertically. // to avoid needing to scroll vertically.
chart.draw(dataTable); chart.draw(dataTable);
var realheight = parseInt(jQuery("#timeline div:first-child div:first-child div:first-child div svg").attr("height"))+70; var realheight = parseInt(jQuery("#timeline div:first-child div:first-child div:first-child svg").attr("height"))+70;
var options = {}; var options = {};
options.height = realheight; options.height = realheight;
chart.draw(dataTable, options); chart.draw(dataTable, options);

View file

@ -1,105 +0,0 @@
<?php
/**
* The template for displaying all single posts and attachments
*
* @package WordPress
* @subpackage Twenty_Sixteen
* @since Twenty Sixteen 1.0
*/
get_header();
?>
<?php
function withinDates( $jSDate, $jEDate ) {
$endYear = date( 'Y' );
$endDate = $endYear . '-12-31';
$startDate = ( $endYear - 2 ) . '-01-01';
$jEDate = ( ! $jEDate ) ? date( 'Y-m-d' ) : ( ( $jEDate > $endDate ) ? $endDate : $jEDate );
return ( ( ( strtotime( $jSDate ) < strtotime( $endDate ) ) && ( strtotime( $jSDate ) > strtotime( $startDate ) ) ) && ( strtotime( $jEDate ) > strtotime( $startDate ) ) );
}
$args = array(
'post_type' => array(
'job',
),
'posts_per_page' => -1,
);
$loop = new WP_Query( $args );
?>
<header class="post-header-title">
<h1 id="page-title">Experience</h1>
<h2 id="page-subtitle">or, a brief history of Ben</h2>
<?php
while ( have_posts() ) :
the_post();
?>
<div class="entry-content tile" id="taxonomy-description">
<?php the_content(); ?>
</div>
<?php endwhile; ?>
</header>
<div id="primary" class="content-area">
<main id="company-main" class="site-main" role="main">
<script type="text/javascript" src="https://www.gstatic.com/charts/loader.js"></script>
<script type="text/javascript">
jQuery(document).ready(function($) {
$('#timeline').height($(window).height() - $('.post-header-title').height() - 50);
});
google.charts.load('current', {'packages':['timeline']});
google.charts.setOnLoadCallback(drawChart);
function drawChart() {
var container = document.getElementById('timeline');
var chart = new google.visualization.Timeline(container);
var dataTable = new google.visualization.DataTable();
dataTable.addColumn({ type: 'string', id: 'Type' });
dataTable.addColumn({ type: 'string', id: 'Role' });
dataTable.addColumn({ type: 'string', role: 'tooltip', 'p': {'html': true} });
dataTable.addColumn({ type: 'date', id: 'Start' });
dataTable.addColumn({ type: 'date', id: 'End' });
dataTable.addRows([
<?php
while ( $loop->have_posts() ) :
$loop->the_post();
?>
<?php
$isCurrent = ( get_post_meta( get_the_ID(), 'end-date', true ) ) ? false : true;
$company = wp_get_object_terms(
get_the_ID(),
'company',
array(
'fields' => 'names',
)
);
$title = html_entity_decode( get_the_title() );
$start = get_the_date();
$end = ( ! get_post_meta( get_the_ID(), 'end-date', true ) ) ? date( 'D M d Y H:i:s O' ) : get_post_meta( get_the_ID(), 'end-date', true );
?>
[
'<?php echo ( $isCurrent ) ? 'Current' : 'Current'; ?>',
'<?php echo $title . ', ' . html_entity_decode( $company[0] ); ?>',
'<div style="padding: 20px"><h1><?php echo $title; ?></h1><h2><?php echo html_entity_decode( $company[0] ); ?></h2><ul><li><?php echo $start; ?>&mdash;<?php echo ( $isCurrent ) ? 'present' : $end; ?></li></ul></div>',
new Date('<?php echo $start; ?>'),
new Date('<?php echo $end; ?>')
],
<?php endwhile; ?>
]);
var options = {
tooltip: {isHtml: true},
timeline: {
showRowLabels: true,
},
};
chart.draw(dataTable, options);
}
</script>
<div id="slider-range"></div>
<div id="timeline"></div>
</main>
</div>
<?php // get_sidebar(); ?>
<?php get_footer(); ?>