fic/server
Archived
1
0
Fork 0
Code Issues Pull requests 10 Releases Wiki Activity

Merge branch 'master' of ssh://git.nemunai.re:6224/fic2014-server

Browse source
This commit is contained in:
Quentin Grosyeux 2013-10-26 21:45:10 +02:00
commit 070f1b263f
13 changed files with 70 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

0
htdocs/css/errors.css → htdocs/css/common.css
View file

3
htdocs/css/home.css
View file

@ -1,3 +0,0 @@
body {
padding: 30px;
}

15
onyx/include/common/Exercice.class.php
View file

@ -1,5 +1,7 @@
<?php
//TODO: get the exercice number
if(!defined('ONYX')) exit;
class Exercice
@ -18,13 +20,14 @@ class Exercice
if (!empty($id))
{
$db = new BDD();
// TODO escape id ?
$res = $db->unique_query("SELECT `id`, `id_theme`, `require`, `level`, `points`, `statement`
FROM exercices
WHERE id=" . intval($id));
WHERE id= '$id'");
if (!empty($res))
{
$this->id = intval($res['id']);
$this->id = $res['id'];
$this->theme = new Theme($res['id_theme']);
$this->require = $res['require'];
$this->level = $res['level'];
@ -32,10 +35,10 @@ class Exercice
$this->statement = $res['statement'];
$this->files = $db->query("SELECT `id`, `path`, `name`
FROM exercice_files
WHERE id_exercice = $id");
WHERE id_exercice = '$id'");
$this->keys = $db->query("SELECT `id`, `format`, `value`
FROM exercice_keys
WHERE id_exercice = $id");
WHERE id_exercice = '$id'");
}
$db->deconnexion();
}
@ -67,7 +70,7 @@ class Exercice
{
$db->query("UPDATE exercices
SET `theme` = '".$theme."', `require` = '".$require."', `level` = '".$level."', `point` = '".$point."', `statement` = '".$statement."'
WHERE id = ".$id);
WHERE id = '$id'");
$aff = $db->affected();
}
@ -154,4 +157,4 @@ class Exercice
"sha1" => $sha1
);
}
}
}

4
onyx/include/team/exercice.php
View file

@ -2,5 +2,9 @@
if(!defined('ONYX')) exit;
$exercice = new Exercice($EXERCICE);
$template->assign("Exercice", $exercice);
//$template->assign("Number", $ex_number);
return "teams/exercice";

3
onyx/include/team/me.php
View file

@ -2,5 +2,4 @@
if(!defined('ONYX')) exit;
return "teams/change";
return "teams/me";

2
onyx/include/team/team.php
View file

@ -10,7 +10,7 @@ try
return "teams/team";
}
catch($e)
catch(Exception $e)
{
return "404";
}

2
onyx/tpl/bootstrap/admin/import_exercices.tpl
View file

@ -1,6 +1,6 @@
{extends file="layout-nav.tpl"}
{block name=head}
<link href="/css/home.css" rel="stylesheet">
<link href="/css/common.css" rel="stylesheet">
{/block}
{block name=content}
<h1>

2
onyx/tpl/bootstrap/admin/import_users.tpl
View file

@ -1,6 +1,6 @@
{extends file="layout-nav.tpl"}
{block name=head}
<link href="/css/home.css" rel="stylesheet">
<link href="/css/common.css" rel="stylesheet">
{/block}
{block name=content}
<h1>

19
onyx/tpl/bootstrap/teams/exercice.tpl Normal file
View file

@ -0,0 +1,19 @@
{extends file="layout-nav.tpl"}
{block name=head}
<link href="/css/common.css" rel="stylesheet">
{/block}
{block name=content}
<!-- TODO: resolved number -->
<div>
<h1>Exercice {$Number} - X</h1>
<ul>
<li>Difficulté : {$Exercice->statement}</li>
<li>Gain :</li>
<!-- Dowloads files -->
<li>Description</li>
<!-- Input solution -->
<ul>
{/block}

2
onyx/tpl/bootstrap/teams/home.tpl
View file

@ -1,7 +1,7 @@
{extends file="layout-nav.tpl"}
{block name=head}
<link href="/css/home.css" rel="stylesheet">
<link href="/css/common.css" rel="stylesheet">
{/block}
{block name=content}

11
onyx/tpl/bootstrap/teams/me.tpl Normal file
View file

@ -0,0 +1,11 @@
{extends file="layout-nav.tpl"}
{block name=head}
<link href="/css/common.css" rel="stylesheet">
{/block}
{block name=content}
<h1>
THIS IS ME
</h1>
{/block}

11
onyx/tpl/bootstrap/teams/summary.tpl Normal file
View file

@ -0,0 +1,11 @@
{extends file="layout-nav.tpl"}
{block name=head}
<link href="/css/common.css" rel="stylesheet">
{/block}
{block name=content}
<h1>
THIS IS SUMMARY
</h1>
{/block}

11
onyx/tpl/bootstrap/teams/team.tpl Normal file
View file

@ -0,0 +1,11 @@
{extends file="layout-nav.tpl"}
{block name=head}
<link href="/css/common.css" rel="stylesheet">
{/block}
{block name=content}
<h1>
THIS IS TEAM
</h1>
{/block}