Commit 4d811c89 authored by Jomaro Rodrigues's avatar Jomaro Rodrigues
Browse files

Merge branch 'master' into analysis_modular

parents 703f4814 75e06a8e
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
{% load static %}<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<title>{{ title|default:"A.D.E.G.A"}}</title>
<link rel="stylesheet" href="{% static 'bootstrap4/css/bootstrap.min.css' %}"/>
</head>
<body>
<header>
</header>
<main class="container-fluid">
<div class="row">
<aside class="col-md-3">
<ul>
<li><a href="{% url 'uploads:home' %}">Upload new</a></li>
</ul>
</aside>
<section id="main" class="col-md-9">
{% block content %}
{% endblock %}
</section>
</div>
</main>
<footer>
@ Copyright 2018 PET Computação UFPR
</footer>
<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
<script src="{% static 'bootstrap4/js/bootstrap.bundle.min.js' %}"></script>
</body>
</html>
\ No newline at end of file
from django.conf.urls import include, url
from django.contrib import admin
urlpatterns = [
url(r'^uploads/', include('uploads.urls', namespace='uploads')),
url(r'^admin/', admin.site.urls),
]
#!/usr/bin/env python
#!/usr/bin/env python3
import os
import sys
if __name__ == "__main__":
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "uploads.settings")
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "adega.settings")
from django.core.management import execute_from_command_line
......
This diff is collapsed.
This diff is collapsed.
Chart.defaults.symmetricErrorLine = Chart.defaults.line;
var custom = Chart.controllers.line.extend({
draw: function(ease) {
Chart.controllers.line.prototype.draw.call(this, ease);
var meta = this.getMeta();
for (m in meta.data) {
var pt0 = meta.data[m];
var point = pt0._view
var chart = this.chart;
var height = chart.chartArea.bottom - chart.chartArea.top;
var ctx = this.chart.chart.ctx;
var datasets = chart.config.data.datasets[pt0._datasetIndex];
var error = datasets.error;
var values = datasets.data;
var p = height / pt0._yScale.max;
var width = pt0._yScale.maxWidth / 4;
var true_error = p * error[pt0._index];
var smallest = point.y + true_error;
if (this.chart.config.options.scales.yAxes[0].ticks.beginAtZero) {
if (smallest >= chart.chartArea.bottom) {
smallest = chart.chartArea.bottom;
}
}
var color = datasets.errorColor;
ctx.beginPath();
ctx.strokeStyle = color;
ctx.moveTo(point.x, point.y);
ctx.lineTo(point.x, smallest);
ctx.lineTo(point.x, point.y - true_error);
ctx.moveTo(point.x, point.y - true_error);
ctx.lineTo(point.x - width, point.y - true_error);
ctx.lineTo(point.x + width, point.y - true_error);
ctx.moveTo(point.x, smallest);
ctx.lineTo(point.x - width, smallest);
ctx.lineTo(point.x + width, smallest);
ctx.stroke();
}
}
});
Chart.controllers.symmetricErrorLine = custom;
Chart.defaults.symmetricErrorBar = Chart.defaults.bar;
var custom2 = Chart.controllers.bar.extend({
draw: function(ease) {
Chart.controllers.bar.prototype.draw.call(this, ease);
var meta = this.getMeta();
for (m in meta.data) {
var pt0 = meta.data[m];
var point = pt0._view
var chart = this.chart;
var height = chart.chartArea.bottom - chart.chartArea.top;
var ctx = this.chart.chart.ctx;
var datasets = chart.config.data.datasets[pt0._datasetIndex];
var error = datasets.error;
var values = datasets.data;
var p = height / pt0._yScale.max;
var width = point.width / 4;
var true_error = p * error[pt0._index];
var smallest = point.y + true_error;
if (this.chart.config.options.scales.yAxes[0].ticks.beginAtZero) {
if (smallest >= chart.chartArea.bottom) {
smallest = chart.chartArea.bottom;
}
}
var color = datasets.errorColor;
ctx.beginPath();
ctx.strokeStyle = color;
ctx.moveTo(point.x, point.y);
ctx.lineTo(point.x, smallest);
ctx.lineTo(point.x, point.y - true_error);
ctx.moveTo(point.x, point.y - true_error);
ctx.lineTo(point.x - width, point.y - true_error);
ctx.lineTo(point.x + width, point.y - true_error);
ctx.moveTo(point.x, smallest);
ctx.lineTo(point.x - width, smallest);
ctx.lineTo(point.x + width, smallest);
ctx.stroke();
}
}
});
Chart.controllers.symmetricErrorBar = custom2;
This diff is collapsed.
<html>
<head>
<meta charset=UTF-8>
<script src="jquery.min.js"></script>
<script src="Chart.min.js"></script>
<script src="ChartType.js"></script>
<script src="chartGenerator.js"></script>
<script src="script.js"></script>
<link rel="stylesheet" type="text/css" href="style.css">
<script src="fileinput.min.js"></script>
<style>
.grafico{
width:500px;
height:200px;
max-height:200px;
}
</style>
</head>
<body>
<div class="grafico">
<canvas id="canvas"></canvas>
</div>
</body>
<script>
var grupos = [
['2010', {A: 12.7, B: 6.1}],
['2011', {A: 13.5746, B: 4.35}],
['2012', {A: 7.6598, B: 3.12}],
['2013', {A: 7.516, B: 1.158}],
['2014', {A: 12.5899, B: 5.1598}],
['2015', {A: 5.1568, B: 3.6998}],
['2016', {A: 3.14995, B: 4.698}],
['2017', {A: 7.2695, B: 2.158}],
];
var config = {
data:grupos,
labels: ['A', 'B'],
options:{
tooltipCallbackLabl: {
error: true,
text: '%B1',
fixed: true,
}
}
}
var ctx = document.getElementById('canvas').getContext('2d');
build_line_chart(ctx, config, ['cyan', 'yellow']);
</script>
</html>
This diff is collapsed.
This diff is collapsed.
$(document).ready(function () {
setup_datatables();
});
function setup_datatables(){
$datatables = $('table.datatable');
if($datatables.length){
$datatables.DataTable({
"paging": false,
"info": false
});
}
}
\ No newline at end of file
html {
min-height: 100%;
position: relative;
}
body {
position: absolute;
top: 0;
bottom: 0;
left: 0;
right: 0;
padding-bottom: 170px;
padding-top: 60px;
}
#wrap-page {
min-height: 95%;
margin: 0;
padding: 0;
position: relative;
top:0;
left: 0;
}
/* ============================================ TOP */
#top {
height: 200px;
background-color: #aaa;
border-bottom: 5px solid #666;
text-align: center;
}
h1#title {
color: #33d333;
font-size: 44px;
}
.navbar-text {
color: #afb0c5 !important;
}
/* ============================================ MESSAGES */
/* ============================================ CONTENT */
#content {
min-height: 100px;
padding: 2em 2em;
}
/* ============================================ FOOTER */
#footer {
background-color: #263646;
border-top: 4px solid #31c2e4;
margin-top: 40px;
padding-top: 20px;
padding-bottom: 80px;
color: #FFF;
}
#footer a {
color: #FFF;
font-size: 1.1em;
}
#footer a:hover {
color: #18BC9C;
}
#footer h3 {
padding-bottom: 4px;
border-bottom: 2px solid #FFF;
}
/* ============================================= REPORTS */
.sidebar{
transition: all 0.5s ease-in-out;
padding: 0;
background-color: #2f4861;
}
.sidebar ul{ list-style:none; margin:0px; padding:0px; }
.sidebar li,
.sidebar li div {
display: flex;
}
.sidebar li a {
flex-grow: 1;
}
.sidebar .drop {
display: inline-block;
padding: 14px 18px;
flex-grow: 0;
}
.sidebar li a,
.sidebar li a.collapsed.active{
padding: 14px 0px 14px 20px;
color: #d3d5d8;
border-left: 0px solid #159e83;
text-decoration: none
}
.sidebar li li a {
padding: 8px auto;
}
.sidebar li a.active{background-color:#2c3e50;border-left:5px solid #159e83; transition: all 0.5s ease-in-out}
.sidebar li a:hover{color:#FFF !important; background-color: #132940}
.sidebar li a i{ padding-right:5px;}
.sidebar ul li .sub-menu li a{ position:relative}
.sidebar ul li .sub-menu li a:hover:after {
content: "";
position: absolute;
left: -5px;
top: 0;
width: 5px;
background-color: #111;
height: 100%;
}
.sidebar ul li .sub-menu li a:hover{ background-color:#222; padding-left:20px; transition: all 0.5s ease-in-out}
.sub-menu{ border-left:5px solid #4a7d73;}
.sidebar li a .nav-label,.sidebar li a .nav-label+span{ transition: all 0.5s ease-in-out}
.sidebar.fliph li a .nav-label,.sidebar.fliph li a .nav-label+span{ display:none;transition: all 0.5s ease-in-out}
.sidebar.fliph {
width: 42px;transition: all 0.5s ease-in-out;
}
.sidebar.fliph li{ position:relative}
.sidebar.fliph .sub-menu {
position: absolute;
left: 39px;
top: 0;
background-color: #222;
width: 150px;
z-index: 100;
}
/* ========================== DEFINICOES ESPECIAIS DE CADA AREA */
/* =========================== PAINEIS ============= */
/* =============================================== PANEL */
.panel-container {
display: -webkit-flex;
display: flex;
justify-content: space-between;
}
.data-panel {
padding: 10px 10px 20px;
margin: 10px;
border-bottom: 2px solid #3c3c3c;
font-size: 1.3em;
flex: 1;
box-shadow: 0 0 1px #DDD;
}
span.data {
margin: 0 1.5em;
}
.panel-line {
display: flex;
}
.data-panel .data-panel {
margin: 2px;
font-size: 1em;
border-bottom: 1px solid #3c3c3c;
box-shadow: none;
}
\ No newline at end of file
from __future__ import unicode_literals
from django.apps import AppConfig
class CoreConfig(AppConfig):
name = 'core'
name = 'uploads'
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment