-
Notifications
You must be signed in to change notification settings - Fork 7
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.
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
Trackhubs #6
Open
alanfwilliams
wants to merge
25
commits into
tdhock:master
Choose a base branch
from
alanfwilliams:trackhub
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Trackhubs #6
Changes from 23 commits
Commits
Show all changes
25 commits
Select commit
Hold shift + click to select a range
a696333
added basic outline of track hub
alanfwilliams a9d8de6
started basic template and fitted inital parameters to template (wip)
alanfwilliams 1c1cccd
continued development of trackhub setup
alanfwilliams b8b68fa
continued development of trackhub setup pt. 3
alanfwilliams d0fc429
improved build setup to allow better debugging of trackhub code
alanfwilliams 7ed618b
added sort functionality to bed file creation
alanfwilliams 3365033
rearranged sort functionality and removed not needed bed files
alanfwilliams 5eaeeac
added db entry and details page
alanfwilliams 57f2a09
added list view and fixed link formatting
alanfwilliams 1eb8869
template improvements, file retrieval (for UCSC) built (needs header …
alanfwilliams 94cbfd0
added makedetails and bigwigs creation
alanfwilliams 7023137
revert to breaks for bed file, fixed remove typo, added color
alanfwilliams f111e20
trackhub db retrivals now uses get(), make_details return empty dicts…
alanfwilliams 5d9a8cd
added back fetchChromSizes (will be removed later)
alanfwilliams 7fef29f
replaced fetchChromSizes with resident chrom size file
alanfwilliams fd9379c
forgot to remove copy command for fetchChromSizes
alanfwilliams ceca034
added back tabs for commented code
alanfwilliams 70d497c
moved sorting and chromosome handling code to file upload process, al…
alanfwilliams f123322
added cleanup functionality, made sure that only the generated bigbed…
alanfwilliams 7b3ba38
added underscore to filename
alanfwilliams 5d882fc
added multiwig functionality and clarified use of camelCase
alanfwilliams db51109
added zero line
alanfwilliams 9587c0a
added url to trackhub detail page, fixed line lengths, added spaces f…
alanfwilliams e438227
shortened links and removed unnecessary <form>, added clarifying comm…
alanfwilliams e60b66b
adjusted trackDb output code to make more readable
alanfwilliams File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
<table class="home"> | ||
<tr> | ||
<th>db</th> | ||
<th>Uploaded by</th> | ||
<th>on</th> | ||
<th>Probes</th> | ||
<th>Copy#</th> | ||
<th>Bkpt</th> | ||
<th colspan="2" >Annotations</th> | ||
<th colspan="3" >Segmentation</th> | ||
<th colspan="2" >Breakpoints</th> | ||
<th colspan="1" >Links</th> | ||
</tr> | ||
|
||
<tr tal:repeat="p profiles" tal:switch="p.ready"> | ||
<td class="left" tal:condition="p.ready"> | ||
<input type="checkbox" name="profile" value="${p.name}"> | ||
${p.name} | ||
</input> | ||
</td> | ||
<td tal:condition="p.ready == False"> | ||
${p.name} | ||
</td> | ||
<td>${p.db}</td> | ||
<td tal:condition="str(user) == p.uploader"> | ||
you [<a href="/delete_profile/${p.name}/">Delete</a>] | ||
</td> | ||
<td tal:condition="str(user) != p.uploader"> | ||
${p.uploader} | ||
</td> | ||
<td class="mono">${p.uploaded_on.strftime("%d-%b-%Y")}</td> | ||
<td>${p.share}</td> | ||
<td class="numeric">${p.probes}</td> | ||
<td tal:condition="p.ready" class="numeric"> | ||
<div tal:condition="p.copies">${p.copies}</div> | ||
</td> | ||
<td tal:condition="p.ready" class="numeric"> | ||
<div tal:condition="p.breakpoints">${p.breakpoints}</div> | ||
</td> | ||
</tr> | ||
</table> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
|
||
<metal:main use-macro="load: base.pt"> | ||
<title metal:fill-slot="title"> | ||
SegAnnDB: Trackhub Details | ||
</title> | ||
|
||
<div metal:fill-slot="content"> | ||
|
||
<p> | ||
<br/> | ||
Trackhub data for ${short_name} | ||
</p> | ||
<br/> | ||
<p> | ||
Description: ${long_name} | ||
</p> | ||
<br/> | ||
<p> | ||
URL: <a href="${url}">${url}</a> | ||
<br/> | ||
Paste this into UCSC's My Hub page to view your trackhub. | ||
</p> | ||
<br/> | ||
<p> | ||
Profiles: | ||
<br/> | ||
<div tal:repeat="p profiles"> | ||
<td> | ||
<a href="/profile/${p}/">${p}</a> | ||
</td> | ||
</div> | ||
<br/> | ||
<p>Return to <a href="/">home</a>.</p> | ||
</div> | ||
</metal:main> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
|
||
<metal:main use-macro="load: base.pt"> | ||
<title metal:fill-slot="title">> | ||
SegAnnDB: Export Trackhub | ||
</title> | ||
|
||
<div metal:fill-slot="content"> | ||
<p>Please fill out the profile data.</p> | ||
<form enctype="multipart/form-data" method="post"> | ||
<p><label for="id_short_label">Short Label:</label> | ||
<input type="text" name="short_label" id="id_short_label" /> | ||
<label for="id_long_label">Long Label:</label> | ||
<input type="text" name="long_label" id="id_long_label" /> | ||
<label for="id_db">DB</label> | ||
<input type="text" name="db" id="id_db" /> | ||
|
||
</p> | ||
<metal:main use-macro="load: export_table.pt"/> | ||
<input id="submit_button" type="submit" | ||
value="Create Track Hub" /> | ||
</form> | ||
|
||
<p>Return to <a href="/">home</a>.</p> | ||
|
||
</div> | ||
</metal:main> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
|
||
|
||
<title> | ||
SegAnnDB: Trackhub List for ${user} | ||
</title> | ||
|
||
|
||
<p> | ||
Trackhubs: | ||
</p> | ||
<p> | ||
<div tal:repeat="t trackhubs"> | ||
<td> | ||
<a href="${url}/trackhub_details/${t}/">${t}</a> | ||
</td> | ||
</div> | ||
</p> |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sorry for not mentioning this earlier but it is usually a bad idea to use a form if there are no fields/data to submit, as is the case above. in this case you could just use a standard link,
a href
instead, right?and actualy i would suggest changing the URL scheme from
/trackhub_*/${user}/
to simply/trackhub_*/
because anyways the user variable is stored in the session info