Skip to content

Donald #2

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
donaldjhui wants to merge 22 commits into
base: master
Choose a base branch
from
Open

Donald #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
587dbbe
preliminary database tables
jajkelle Oct 13, 2018
3fa8526
preliminary db model with user, resource, and location tables
jajkelle Oct 13, 2018
9050903
Logo + slogan
jajkelle Oct 15, 2018
b1498d4
pool of resource images
jajkelle Oct 15, 2018
32b328e
template-helio is a free bootstrap css template
jajkelle Oct 15, 2018
c57e23c
dummy text to work with template helio
jajkelle Oct 15, 2018
4f39636
better css template
jajkelle Oct 15, 2018
77be238
index.html to work with template industrious
jajkelle Oct 15, 2018
81d7a91
still testing things, will continue tomorrow
donaldjhui Oct 19, 2018
c226ed4
Added some functions and made some changes.
donaldjhui Oct 20, 2018
1c82800
Add files via upload
donaldjhui Oct 26, 2018
eebc0af
view_resource.html
donaldjhui Oct 29, 2018
7e84fc2
made changes to add_resource and view_resource, working
donaldjhui Oct 29, 2018
708b47a
modified menu screen, add and view tabs work
donaldjhui Oct 29, 2018
cea2aa6
changed the "welcome"s to "HelpMeHelpYou"
donaldjhui Oct 29, 2018
9588251
made changes to delete_resource
donaldjhui Oct 29, 2018
00e958a
delete_resource.html
donaldjhui Oct 29, 2018
2631c62
delete tab will go to delete page
donaldjhui Oct 29, 2018
b5547b5
made delete_resource show resources for user
donaldjhui Oct 29, 2018
e4e7b85
deleted 1 word
donaldjhui Oct 29, 2018
8e35614
made some changes to update name
donaldjhui Oct 29, 2018
f800842
Updating files, working functions and code.
donaldjhui Nov 13, 2018
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
Binary file added Documents/Sprint 1 Plan.pdf
View file
Open in desktop
Binary file not shown.
Binary file removed Documents/SprintPlan.pdf
View file
Open in desktop
Binary file not shown.
36 changes: 36 additions & 0 deletions add_resource.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{{extend 'layout.html'}}

<h2>Add resource</h2>

{{=(form)}}

<p />


<head>
<style>
table, th, td {
border: 1px solid black;
}
</style>
</head>

<table style="width:100%">
<tr>
<strong>
<th>Resource Id</th>
<th>Resource Type</th>
<th>Resource Qty</th>
<th>Resource Owner</th>
</strong>
</tr>

{{for specification in specifications:}}
<tr>
<td>{{=specification.resources_id}}</td>
<td>{{=specification.resources_type}}</td>
<td>{{=specification.resources_qty}}</td>
<td>{{=specification.resource_owner.username}}</td>
</tr>
{{pass}}
</table>
Loading