Skip to content

Subo cambios aplicacion time tracker #1

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

Open
Joxeph10 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Subo cambios aplicacion time tracker #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions TimeTracker/controllers/TimeTrackerController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
var app = angular.module("TimeTrackerModule", ['ui.grid']);

app.controller('TimeTrackerController', function($scope) {
$scope.myData = [{name: "Moroni", age: 50},
{name: "Tiancum", age: 43},
{name: "Jacob", age: 27},
{name: "Nephi", age: 29},
{name: "Enos", age: 34}];
$scope.gridOptions = { data: 'myData' };
});
114 changes: 114 additions & 0 deletions TimeTracker/css/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
body,
html {
margin:20px;
padding:20px;
color:#000;
background:#a7a09b;
}

#header {
background:#ddd;
padding:5px 10px;
}

#sidebar {
background:#999;
border: 1px;
border-color: #789;
border-style: solid;
border-radius: 20px;
float:left;
margin: 5px 5px;
text-align: center;
width:20%;
}

#main {
width: 78%;
float:left;
}

#titulo {
background:#999;
border: 1px;
border-color: #789;
border-style: solid;
border-radius: 20px;
margin: 5px 5px;
text-align: center;
}

#registro {
background:#999;
border: 1px;
border-color: #789;
border-style: solid;
border-radius: 20px;
margin: 5px 5px;
text-align: center;
height: 100px;
}


#registro_a {
float:left;
width:30%;
}

#registro_b {
float:right;
width:70%;
}

#registro_b1 {
float:left;
width:70%;
text-align: left;
}

#registro_b2 {
float:right;
width:30%;
}


#datos {
background:#999;
border: 1px;
border-color: #789;
border-style: solid;
border-radius: 20px;
margin: 5px 5px;
text-align: center;
float: none;
}

.gridStyle {
border: 1px solid rgb(212,212,212);
/*width: 600px;*/
/*height: 300px;*/
margin: 10px 20px;
}

#footer {
clear:both;
background:#ddd;
padding:5px 0px;
}

#footer p {
margin:0;
text-decoration: underline;
text-align: right;
margin: 0px 5px;
}

h1 {
margin:0;
}


input{
width: 200px;
}

83 changes: 83 additions & 0 deletions TimeTracker/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
<!DOCTYPE html>
<html lang="en" data-ng-app="TimeTrackerModule">
<head>
<meta charset="UTF-8">
<title>AngularJS - Time Tracker</title>
<script type="text/javascript" src="scripts/app.js"></script>
<link rel="stylesheet" href="css\styles.css">
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.23/angular.min.js"></script>
<!--<script type="text/javascript" src="controllers/TimeTrackerController.js"></script>-->
</head>
<body data-ng-controller="TimeTrackerController">
<div id="wrap">
<!-- top bar -->
<div id="header"><h1>Time Tracker</h1></div>

<!-- area de trabajo -->
<div id="workspace">
<!-- menu lateral -->
<div id="sidebar">
<div>
<h3>Bienvenido: </h3>
<h2>Jose Luis Lopez</h2>
<p>Registra aqui tus actividades diarias.</p>
</div>
</div>

<!-- area de registro -->
<div id="main">

<!-- titulo -->
<div id="titulo"><h2>Registro de Actividades</h2></div>

<!-- registro -->
<div id="registro">
<div id="registro_a"><h2>Ingrese Datos</h2></div>
<div id="registro_b">
<div id="registro_b1">
<form id="frmActivities" name="frmActivities">
<ul>
<li>
<label for="txtFecha">Seleccione Fecha: </label>
<input data-ng--model="date" data-ng--required="true" id="txtFecha" name="txtFecha" type="date"></input>
</li>
<li>
<label for="txtActividad">Ingrese Actividad: </label>
<input data-ng--model="date" data-ng--required="true" id="txtActividad" name="txtActividad" type="text"></input>
</li>
<li>
<label style="width: 200px" for="txtDuracion">Duracion: </label>
<input id="txtDuracion" name="txtDuracion" type="time"></input>
</li>
</ul>
</form>
</div>
<div id="registro_b2"><button id="btnRegistrar">Registrar</button></div>
</div>
</div>

<!-- listado de tareas -->
<div id="datos">
<div><h2>Historial de Tareas</h2></div>
<div>
<!--<div data-ng--view></div>-->
<!--<div class="gridStyle" data-ng--grid="gridOptions"></div>-->
<div class="gridStyle" data-ng-init="names=[{name:'Jani',country:'Norway'},{name:'Hege',country:'Sweden'},{name:'Kai',country:'Denmark'}]">
<ul>
<li data-ng-repeat="x in names">
{{ x.name + ', ' + x.country }}
</li>
</ul>

</div>
</div>
</div>
</div>
</div>

<div id="footer">
<p>Powered by Angular JS </p>
</div>
</div>
</body>
</html>
Loading