htsworkflow.git
12 years agoDjango 1.1's csrf protection appears to be handled in the middleware component. 0.5.3
Diane Trout [Thu, 8 Sep 2011 22:22:56 +0000 (15:22 -0700)]
Django 1.1's csrf protection appears to be handled in the middleware component.
So remove the csrf_token tag until we upgrade

12 years agoAdd links to the admin page on the public pages if you're logged in as staff.
Diane Trout [Thu, 8 Sep 2011 22:12:50 +0000 (15:12 -0700)]
Add links to the admin page on the public pages if you're logged in as staff.

This also required tightening the css for the list of flowcells on the
inventory page.

12 years agoMake it so the login link redirects you back to the page you were looking at.
Diane Trout [Thu, 8 Sep 2011 00:35:34 +0000 (17:35 -0700)]
Make it so the login link redirects you back to the page you were looking at.

I did this by adding a processing instruction to add a thispage
variable to RequestContext.

12 years agoEmacs stripped off trailing whitespace
Diane Trout [Thu, 8 Sep 2011 00:33:22 +0000 (17:33 -0700)]
Emacs stripped off trailing whitespace

12 years agoAdd link to admin page to flowcell & library pages for logged in staff
Diane Trout [Wed, 7 Sep 2011 22:00:27 +0000 (15:00 -0700)]
Add link to admin page to flowcell & library pages for logged in staff

12 years agoRemove margin-right command as it was making a giant blank space in chromium
Diane Trout [Wed, 7 Sep 2011 21:56:02 +0000 (14:56 -0700)]
Remove margin-right command as it was making a giant blank space in chromium

12 years agoIgnore some files generated by my (diane's) development environment.
Diane Trout [Fri, 2 Sep 2011 23:30:11 +0000 (16:30 -0700)]
Ignore some files generated by my (diane's) development environment.

12 years agoAttempt to download DAF data for a encodesubmit submission
Diane Trout [Fri, 2 Sep 2011 23:28:39 +0000 (16:28 -0700)]
Attempt to download DAF data for a encodesubmit submission

This required trying to make htsworkflow/submission/daf.py more
flexible, and not assuming that it was going to get a "submission log name"

Also theres some changes to make pep8/pylint happier

12 years agoAdd error message for requesting link-daf but no daf file name was provided
Diane Trout [Fri, 2 Sep 2011 21:08:55 +0000 (14:08 -0700)]
Add error message for requesting link-daf but no daf file name was provided
Also remove trailing whitespace from some lines

12 years agoEnable csrf proection when running under Django 1.2
Diane Trout [Wed, 31 Aug 2011 22:38:41 +0000 (15:38 -0700)]
Enable csrf proection when running under Django 1.2

12 years agoRescan a flowcell data run once per (setting.RESCAN_DELAY) days for files.
Diane Trout [Thu, 18 Aug 2011 22:57:33 +0000 (15:57 -0700)]
Rescan a flowcell data run once per (setting.RESCAN_DELAY) days for files.
Defaults to 1 day.

12 years agoDeal with (failed) in flowcell names.
Diane Trout [Mon, 8 Aug 2011 22:35:41 +0000 (15:35 -0700)]
Deal with (failed) in flowcell names.

Create a test case that triggers it and use '__startswith' to
work around the name.

12 years agoAdd a way to browse the list of entered antibody/antigene
Diane Trout [Thu, 4 Aug 2011 19:59:07 +0000 (12:59 -0700)]
Add a way to browse the list of entered antibody/antigene

12 years agoMake a test more robust to different versions of librdf
Diane Trout [Fri, 29 Jul 2011 21:31:37 +0000 (14:31 -0700)]
Make a test more robust to different versions of librdf
[] vs <> change in nodes.

12 years agoConstruct unit tests for inventory/hard disk long term storage component.
Diane Trout [Fri, 29 Jul 2011 19:33:05 +0000 (12:33 -0700)]
Construct unit tests for inventory/hard disk long term storage component.

This involved RDFing a couple of the templates to make it easier
to make sure the right types of information were on the web pages.

I also added a new namespace http://jumpgate.caltech.edu/wiki/InventoryOntology#

There was also a missing </div> in one of the templates that I fixed.

12 years agoAn improvement on the inventory system. Getting it going again.
Brandon W. King [Thu, 28 Jul 2011 02:04:29 +0000 (19:04 -0700)]
An improvement on the inventory system. Getting it going again.

12 years agoExamine the DAF to determine if the DDF needs to include replicate information
Diane Trout [Thu, 28 Jul 2011 18:40:24 +0000 (11:40 -0700)]
Examine the DAF to determine if the DDF needs to include replicate information

12 years agoStop copying attributes from library to a submission node
Diane Trout [Wed, 20 Jul 2011 00:45:01 +0000 (17:45 -0700)]
Stop copying attributes from library to a submission node
Instead just query the library directly.

This involved updating the sparql query in make_ddf a bit.

Associated with doing that I also changed when I import
data from the RDFa pages, so I only connect to the web server
once per library, instead of once per scanned file per attribute.

That provided a significant performance improvement.

12 years agoRemove spurious debugging print statement
Diane Trout [Wed, 20 Jul 2011 00:40:54 +0000 (17:40 -0700)]
Remove spurious debugging print statement

12 years agoAdd an option to print out an example view to extension RDF map
Diane Trout [Wed, 20 Jul 2011 00:39:51 +0000 (17:39 -0700)]
Add an option to print out an example view to extension RDF map
(Which is the start of the extra override rules file I've been using
for submissions)

12 years agoMake searching library & cell line more robust to missing data
Diane Trout [Wed, 20 Jul 2011 00:38:27 +0000 (17:38 -0700)]
Make searching library & cell line more robust to missing data
and add example to limit to a date range, to help with status reports.

12 years agoSearch for both encode & mouse encode projects.
Diane Trout [Wed, 20 Jul 2011 00:35:58 +0000 (17:35 -0700)]
Search for both encode & mouse encode projects.
Add better function (with tests) for finding library IDs in the names
on encodesubmit.

12 years agoUpdate old dt-overrides.turtle example to use the newer library urls
Diane Trout [Wed, 20 Jul 2011 00:34:53 +0000 (17:34 -0700)]
Update old dt-overrides.turtle example to use the newer library urls

12 years agoMake antibody catalog number optional for creating entries 0.5.2
Diane Trout [Wed, 13 Jul 2011 21:31:16 +0000 (14:31 -0700)]
Make antibody catalog number optional for creating entries

12 years agoMake sure we can roundtrip unicode characters via converting to utf-8
Diane Trout [Wed, 13 Jul 2011 21:27:34 +0000 (14:27 -0700)]
Make sure we can roundtrip unicode characters via converting to utf-8

12 years agoAdd "Count of multi-reads" back into the library page
Diane Trout [Sat, 9 Jul 2011 00:33:51 +0000 (17:33 -0700)]
Add "Count of multi-reads" back into the library page
(Also encode the mapped read counts as RDFa

12 years agoDon't use xsd:string for string data types in toTypedNode
Diane Trout [Thu, 7 Jul 2011 23:58:29 +0000 (16:58 -0700)]
Don't use xsd:string for string data types in toTypedNode
I saw a reference that "foo" and "foo"^xsd:string should
be treated the same, and man isn't the first version shorter
to write and easier to read?

12 years agoLibrary urls have a trailing /. make sure the test case uses that
Diane Trout [Thu, 7 Jul 2011 23:57:12 +0000 (16:57 -0700)]
Library urls have a trailing /. make sure the test case uses that

12 years agoMerge branch 'master' of mus.cacr.caltech.edu:htsworkflow
Diane Trout [Thu, 7 Jul 2011 00:45:26 +0000 (17:45 -0700)]
Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow

12 years agoFix namespace issues in encode_find after the conversion
Diane Trout [Thu, 7 Jul 2011 00:42:56 +0000 (17:42 -0700)]
Fix namespace issues in encode_find after the conversion
for ucsc_gather.

Also I really need to implement a function to compute the library
URN. e.g. <http://jumpgate.caltech.edu/library/12345/>

12 years agoAdd some additional logging to util/rdflib.py to help debugging
Diane Trout [Wed, 6 Jul 2011 22:29:43 +0000 (15:29 -0700)]
Add some additional logging to util/rdflib.py to help debugging

12 years agoMake sure that the lane set is sorted on the flowcell table page
Diane Trout [Fri, 1 Jul 2011 01:36:57 +0000 (18:36 -0700)]
Make sure that the lane set is sorted on the flowcell table page

12 years agoMerge branch 'master' of mus.cacr.caltech.edu:htsworkflow
Diane Trout [Thu, 30 Jun 2011 22:48:57 +0000 (15:48 -0700)]
Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow

12 years agoThe proper DDF variable name for files to be submitted is files
Diane Trout [Thu, 30 Jun 2011 22:47:40 +0000 (15:47 -0700)]
The proper DDF variable name for files to be submitted is files
Also the older librdf resource formatting used [] instead of <>
so can't be directly placed into a sparql query

12 years agoOlder librdf gets cranky when mixing unicode & strings
Diane Trout [Thu, 30 Jun 2011 22:44:57 +0000 (15:44 -0700)]
Older librdf gets cranky when mixing unicode & strings

12 years agoDjango 1.1 doesn't support validators so remove it for the time
Diane Trout [Thu, 30 Jun 2011 22:43:44 +0000 (15:43 -0700)]
Django 1.1 doesn't support validators so remove it for the time

12 years agoFix typo in a template
Diane Trout [Thu, 30 Jun 2011 22:42:30 +0000 (15:42 -0700)]
Fix typo in a template

12 years agoMerge branch 'master' of mus.cacr.caltech.edu:htsworkflow
Diane Trout [Thu, 30 Jun 2011 21:45:05 +0000 (14:45 -0700)]
Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow

12 years agoswitch fix_ob3 to the better way of finding settings file
Diane Trout [Thu, 30 Jun 2011 20:46:05 +0000 (13:46 -0700)]
switch fix_ob3 to the better way of finding settings file

12 years agoFurther clean up ddf generation.
Diane Trout [Wed, 29 Jun 2011 06:11:04 +0000 (23:11 -0700)]
Further clean up ddf generation.

This still needs work as I ended up hard coding a sparql query
to support the submission I'm currently working on -- which is
unfortunate as the whole point of the push to RDF was to reduce
hard coding.

However it did simplify collecting information for make_ddf.

Using the query would also mean that the term copying I was doing
earlier, moving library attributes into each specific submission view
would be unecessary, since I can now easily query the graphs.

Probably what I need to do after the submission is to reduce the
term copying when importing a submisison directory, and add some
way of tying a sparql query to a specific imported daf.

Though I need to deal with the upcoming submission deadlines first.

12 years agoStart supporting multiple libraries per lane, as needed for the HiSeq
Diane Trout [Tue, 28 Jun 2011 00:18:16 +0000 (17:18 -0700)]
Start supporting multiple libraries per lane, as needed for the HiSeq

This commit alters the admin page to allow entering multiple libraries
per lane, and updates the new flowcell and flowcell lane views
to work with having multiple lane objects with the same lane number.

I'll still need to update the configuration generation and archiving
result files.

12 years agoMerge branch 'master' of mus.cacr.caltech.edu:htsworkflow
Diane Trout [Thu, 23 Jun 2011 21:56:46 +0000 (14:56 -0700)]
Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow

Conflicts:
extra/ucsc_encode_submission/ucsc_gather.py
htsworkflow/submission/test/test_daf.py

Also merging the conflict was made more difficult by needing
to work around changes in the older version of librdf on 10.04

12 years agoSlightly alter some tests to work with versions of python on ubuntu 10.04
Diane Trout [Wed, 22 Jun 2011 22:07:12 +0000 (15:07 -0700)]
Slightly alter some tests to work with versions of python on ubuntu 10.04

12 years agoMove parse_flowcell_id out of frontend.samples.results
Diane Trout [Wed, 22 Jun 2011 22:05:59 +0000 (15:05 -0700)]
Move parse_flowcell_id out of frontend.samples.results
this is so the fastq extraction code can run on systems without
django installed.

12 years agoallow running ucsc_gather --fastq without specifying an analysis name or model
Diane Trout [Wed, 22 Jun 2011 22:04:04 +0000 (15:04 -0700)]
allow running ucsc_gather --fastq without specifying an analysis name or model

12 years agoFinish new RDF based ddf construction.
Diane Trout [Tue, 21 Jun 2011 23:15:09 +0000 (16:15 -0700)]
Finish new RDF based ddf construction.
The previous patch hadn't implemented actually writing the ddf to
a file.

12 years agoRework ucsc gather to use RDF models for gathering and storing track metadata.
Diane Trout [Sat, 18 Jun 2011 21:03:36 +0000 (14:03 -0700)]
Rework ucsc gather to use RDF models for gathering and storing track metadata.

I dumped all of my rdf namespace definitions into rdfhelp.py to comply
with don't-repeat-yourself.

The major step forward for this is I can now specify additional
attributes for a submission that aren't found in the htsworkflow database.

Also the daf model attribute lookup function implements a brute force
owl:sameAs search. (If it can't find the term you asked for, it'll search for
sameAs terms and look for those).

The TestDAFMapper unit test is a bit slow as it needs to check
the htsworkflow server for one of the test cases. I should come
up with a way to preload the required information into the testcase.

12 years agoMerge branch 'master' of mus.cacr.caltech.edu:htsworkflow
Diane Trout [Sat, 18 Jun 2011 20:31:03 +0000 (13:31 -0700)]
Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow

12 years agoInclude the library_id in addition to the RDFa library uri
Diane Trout [Sat, 18 Jun 2011 20:29:39 +0000 (13:29 -0700)]
Include the library_id in addition to the RDFa library uri
Hopefully forcing the trailing '/' in the uri won't cause
trouble elsewhere.

12 years agoMerge branch 'master' of mus.cacr.caltech.edu:htsworkflow
Diane Trout [Fri, 17 Jun 2011 23:08:20 +0000 (16:08 -0700)]
Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow

12 years agoMinor RDFa fixes.
Diane Trout [Fri, 17 Jun 2011 23:05:55 +0000 (16:05 -0700)]
Minor RDFa fixes.
RDFa likes to use <a hrefs for the subject name, and by adding
links to the species I was confusing what species I was talking about.
Also I added the numeric types to the gel_cut and insert_size values.

12 years agoStart to move all the RDF namespace definitions into a single module.
Diane Trout [Wed, 15 Jun 2011 21:44:59 +0000 (14:44 -0700)]
Start to move all the RDF namespace definitions into a single module.
Also use less abbreviated names.

12 years agoAdd module to parse UCSC DAF file.
Diane Trout [Wed, 15 Jun 2011 02:31:45 +0000 (19:31 -0700)]
Add module to parse UCSC DAF file.
This includes some utilities to help convert the DAF dictionary
to a librdf model.

12 years agoMove code to make srf and qseq to fastq condor scripts to its own module
Diane Trout [Wed, 15 Jun 2011 02:29:54 +0000 (19:29 -0700)]
Move code to make srf and qseq to fastq condor scripts to its own module

12 years agoSample Test RDFA needed the flowcell id field
Diane Trout [Wed, 15 Jun 2011 02:26:08 +0000 (19:26 -0700)]
Sample Test RDFA needed the flowcell id field

12 years agoRemove some uneeded linefeeds
Diane Trout [Wed, 15 Jun 2011 02:25:15 +0000 (19:25 -0700)]
Remove some uneeded linefeeds

12 years agoFix a template typo
Diane Trout [Tue, 14 Jun 2011 21:32:09 +0000 (14:32 -0700)]
Fix a template typo
remove a RDFa tag for a flowcell id that wasn't pulling a parse_flowcell_id
name.

12 years agoSupprose IVC plot table rows if we don't have data for a lane
Diane Trout [Mon, 13 Jun 2011 23:51:27 +0000 (16:51 -0700)]
Supprose IVC plot table rows if we don't have data for a lane
Django 1.1 doesn't have conditionals so I needed a different
way to suppress the other lanes for the specific lane detail page.
And finally the links produced by Lane.get_absolute_url needed
to strip the parenthetical comment from the flowcell IDs

12 years agoFollow the flowcell link from the library page.
Diane Trout [Mon, 13 Jun 2011 22:04:44 +0000 (15:04 -0700)]
Follow the flowcell link from the library page.
Need to test to make sure that flowcells with parentheticall comments
are accessible.

e.g. 12345AAXX (failed) -> /flowcell/12345AAXX/
and the flowcell link actually returns a page.

12 years agoThe get_permanent_link function on the flowcell model didn't work
Diane Trout [Mon, 13 Jun 2011 21:42:53 +0000 (14:42 -0700)]
The get_permanent_link function on the flowcell model didn't work
for flowcells with parenthetical status comments.

This fixes that problem and adds a testcase to make sure the link
does show up correctly

12 years agoRemove some now unnecessary coments and reformat some parameter lists to be easier...
Diane Trout [Mon, 13 Jun 2011 21:42:04 +0000 (14:42 -0700)]
Remove some now unnecessary coments and reformat some parameter lists to be easier to read

12 years agopython's 2.6 uuid function doesn't cast to a string in django
Diane Trout [Sat, 11 Jun 2011 03:02:35 +0000 (20:02 -0700)]
python's 2.6 uuid function doesn't cast to a string in django
so write our own str_uuid function and use that to initialize
the DataFile.random_key field

12 years agoMerge branch 'master' of mus.cacr.caltech.edu:htsworkflow
Diane Trout [Sat, 11 Jun 2011 00:24:52 +0000 (17:24 -0700)]
Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow

12 years agoConvert Rami's DataRun feature to something useful to us.
Diane Trout [Sat, 11 Jun 2011 00:14:16 +0000 (17:14 -0700)]
Convert Rami's DataRun feature to something useful to us.
(and more)

The data run captures some of the core values of a run, namely
the location of the result directory (relative to settings.RESULT_HOME_DIR)
and what the run cycle start/stop was.

The code will also scan the result directory looking for files whose
names match patterns stored in the FileType table and link those
to the DataRun in a DataFile table.

An unresolved issue is when & how often to scan the result directory --
currently when a live site flowcell is viewed it will look in the result
directory and import whatever it sees there. If it sees that result folder
again it wont bother to try and import it.

I might imagine problems if someone's hitting reload on a flowcell page
while the result files are being copied in.

I still need to implement a table to store results imported from the
run xml file. Also the old result folder scanning code used in the library
page should probably be updated to use the newer DataRun files.

Lastly there were some layout changes to a few pages and some
CSS rules got relocated.

12 years agoThe srf/qseq --raw-format patch.
Brandon W. King [Fri, 10 Jun 2011 22:11:03 +0000 (15:11 -0700)]
The srf/qseq --raw-format patch.

Signed-off-by: Diane Trout <diane@caltech.edu>
12 years agoMove test srf files to testdata directory so I can use them in other tests
Diane Trout [Thu, 9 Jun 2011 23:35:30 +0000 (16:35 -0700)]
Move test srf files to testdata directory so I can use them in other tests

12 years agoAdd a method to return the runfolder name.
Diane Trout [Thu, 9 Jun 2011 22:38:05 +0000 (15:38 -0700)]
Add a method to return the runfolder name.
Add a newer version of the run_*.xml file format for testing
Also make sure that the various versions of the run xml file
have the same "api". (Its not particularly obvious to use).

12 years agoAdd in test code to verify RDF data being added to the library page.
Diane Trout [Fri, 27 May 2011 00:56:37 +0000 (17:56 -0700)]
Add in test code to verify RDF data being added to the library page.

12 years agoTrivial change, add human to common name of "homo sapiens"
Diane Trout [Fri, 27 May 2011 00:55:05 +0000 (17:55 -0700)]
Trivial change, add human to common name of "homo sapiens"

12 years agoAdd feature to manage and print labels.
Lorian Schaeffer [Thu, 26 May 2011 17:32:37 +0000 (10:32 -0700)]
Add feature to manage and print labels.

12 years agoMerge branch 'add-condition'
Diane Trout [Thu, 26 May 2011 17:47:24 +0000 (10:47 -0700)]
Merge branch 'add-condition'

Conflicts:
htsworkflow/frontend/templates/samples/library_detail.html

Resolve differences between the headers of library_detail for
adding RDFa and reordering the sample details.

12 years agoMake antibody & condition visible. add-condition
Diane Trout [Wed, 25 May 2011 00:00:02 +0000 (17:00 -0700)]
Make antibody & condition visible.
Also change replicate number to allow null and not autodefault to 1.
Lastly reorganize the fields on the library page to be a bit less confusing.

12 years agoWrite the librdf model database somewhere other than /tmp
Diane Trout [Wed, 18 May 2011 23:49:33 +0000 (16:49 -0700)]
Write the librdf model database somewhere other than /tmp
It should be made configurable at some point.

12 years agoPretty print the json files to help debugging
Diane Trout [Mon, 16 May 2011 22:04:49 +0000 (15:04 -0700)]
Pretty print the json files to help debugging

When trying to initialize a new postgresql database from scratch
there was some referential integrity error because of a foriegn
key constraint.

12 years agoAllow configuring additional database settings so we can use postgres.
Diane Trout [Mon, 16 May 2011 22:02:45 +0000 (15:02 -0700)]
Allow configuring additional database settings so we can use postgres.

Now instead of a couple of database settings in [frontend] in
the htsworkflow.ini file, frontend just points to a different
ini configuration block that contains the ability to set all
of the database configuration parameters.

12 years agoAdd fake settings.py file point to the real htsworkflow.settings file
Diane Trout [Mon, 9 May 2011 23:56:54 +0000 (16:56 -0700)]
Add fake settings.py file point to the real htsworkflow.settings file
manage.py and nosetests were assuming that settings were in the current
directory.

Though a little later in its startup manage.py switched to thinking
settings was in htsworkflow.setttings. I have no idea why

12 years agoMerge branch 'master' of mus.cacr.caltech.edu:htsworkflow
Diane Trout [Mon, 9 May 2011 22:05:49 +0000 (15:05 -0700)]
Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow

12 years agoMove default_pm setting to a little more predictable of a location
Diane Trout [Mon, 9 May 2011 22:05:32 +0000 (15:05 -0700)]
Move default_pm setting to a little more predictable of a location

12 years agoKeep moving settings around until I can find a place that tests on multiple machines
Diane Trout [Mon, 9 May 2011 21:54:47 +0000 (14:54 -0700)]
Keep moving settings around until I can find a place that tests on multiple machines

12 years agoAdd utility program to help find what exists in georgi's submission dirs
Diane Trout [Mon, 9 May 2011 21:54:13 +0000 (14:54 -0700)]
Add utility program to help find what exists in georgi's submission dirs

12 years agoReport missing directory names to help diagnose sequence scanning problems
Diane Trout [Mon, 9 May 2011 21:53:17 +0000 (14:53 -0700)]
Report missing directory names to help diagnose sequence scanning problems

12 years agoValidate fastq files in both phred33 & phred64 versions
Diane Trout [Mon, 9 May 2011 21:52:04 +0000 (14:52 -0700)]
Validate fastq files in both phred33 & phred64 versions
Do not validate some imaginary fasta/fastq hybrid that I imagined
late some night.

I needed to add a parameter to pick which fastq format is in use.

12 years agoMake a slightly less confusing 404 error message 0.5.1
Diane Trout [Fri, 6 May 2011 22:44:43 +0000 (15:44 -0700)]
Make a slightly less confusing 404 error message

13 years agoBe more flexible with fastq filenames.
Diane Trout [Mon, 18 Apr 2011 22:54:44 +0000 (15:54 -0700)]
Be more flexible with fastq filenames.
Allow pass/nopass, all, or no filter flag.

Also add more information to exception text

13 years agodjango-nose didn't work with django 1.1, so I went back to the nose plugin NoseDjango
Diane Trout [Wed, 6 Apr 2011 20:49:26 +0000 (13:49 -0700)]
django-nose didn't work with django 1.1, so I went back to the nose plugin NoseDjango
I needed to move the settings file around a bit so the default build of
nosedjango will find it (instead of my previously hacked copy).

I got tired of modifying the location of the settings files and
discovered that django has a standardized way of grabbign the config
file. with "from django.conf import settings", though that will
only show uppercased config entries.

13 years agoAdjust django driver script to test the whole package.
Diane Trout [Tue, 5 Apr 2011 17:10:17 +0000 (10:10 -0700)]
Adjust django driver script to test the whole package.
I moved settings & manage up a bit in the tree, and added a dependency
on python-django-nose which uses nose for the django test runner.

This version is using the class based runner, which appears
to require django 1.2. I'm not sure what's on the cluster machines
right now.

13 years agoRevert a bad change. Apparently past me knew what I was doing,
Diane Trout [Tue, 5 Apr 2011 05:37:41 +0000 (22:37 -0700)]
Revert a bad change. Apparently past me knew what I was doing,
and I needed to manually construct the dictionary for feeding
a json object, instead of just handing the json.dumps function a
random django object.

unlike the RDFa template which can just operate on the django ORM object.

13 years agoremove spurious debugging print
Diane Trout [Tue, 5 Apr 2011 05:36:57 +0000 (22:36 -0700)]
remove spurious debugging print

13 years agoRemove spurious debug print statements
Diane Trout [Sat, 2 Apr 2011 01:20:59 +0000 (18:20 -0700)]
Remove spurious debug print statements

13 years agoFix a typo inserted into the template.
Diane Trout [Sat, 2 Apr 2011 01:18:37 +0000 (18:18 -0700)]
Fix a typo inserted into the template.

Apparently a {% trans "value" %} needs to be on one line.
This didn't show up until I'd provided the get_absolute_url reference
for flowcells.

13 years agoMerge branch 'master' of mus.cacr.caltech.edu:htsworkflow
Diane Trout [Sat, 2 Apr 2011 01:18:12 +0000 (18:18 -0700)]
Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow

13 years agoAdd pages to show information about a particular flowcell.
Diane Trout [Sat, 2 Apr 2011 01:13:59 +0000 (18:13 -0700)]
Add pages to show information about a particular flowcell.
-- in both human and RDFa formats.

Also I implemented get_absolute_url for flowcells & lanes, which
means "view on site" pops up on the flowcell admin page.

Also with modifying the templates for RDFa, many more elements
on the library, flowcell, and flowcell lane detail pages link to
each other.

I moved the table formatting css out of the library page
and into app.css.

I also switched experiments/views.py from using Context to RequestContext
which provides the default media url to the template.

There were a few changes to samples/views.py to get the more informative
object to the template instead of our on-the-fly created lists.

13 years agoUpdate single vs paired guessing code
Diane Trout [Wed, 30 Mar 2011 21:31:22 +0000 (14:31 -0700)]
Update single vs paired guessing code
Add in new guesses for Georgi files to view names

13 years agoUpdate spoolwatcher to 0.2 benderjab's logging api
Diane Trout [Wed, 9 Mar 2011 00:14:59 +0000 (16:14 -0800)]
Update spoolwatcher to 0.2 benderjab's logging api

13 years agoMove some common runfolder path management code into its own module
Diane Trout [Mon, 7 Mar 2011 23:33:19 +0000 (15:33 -0800)]
Move some common runfolder path management code into its own module
I discovered I had two different functions for checking if something
was a runfolder name. I put them in once place and linked the
two together.
Then I cleaned up the test code that was calling them.

13 years agoAdd a place for "breadcrumbs" back into the base.html page so
Diane Trout [Mon, 7 Mar 2011 23:31:51 +0000 (15:31 -0800)]
Add a place for "breadcrumbs" back into the base.html page so
navigation links appear on the started email page

13 years agoIgnore emacs backup files for things other than python files
Diane Trout [Sat, 26 Feb 2011 00:10:26 +0000 (16:10 -0800)]
Ignore emacs backup files for things other than python files

13 years agoSave the overrides to the RDF model.
Diane Trout [Sat, 26 Feb 2011 00:07:41 +0000 (16:07 -0800)]
Save the overrides to the RDF model.
They're designed to be loaded into the model before we start pulling data
from UCSC and our website.

Currently the file just defines submission to library URN/URL mappings
for the submissions whose submission name doesn't include the correct
library ID.

13 years agoOnly pull web data when its missing from the rdf model.
Diane Trout [Fri, 25 Feb 2011 23:46:15 +0000 (15:46 -0800)]
Only pull web data when its missing from the rdf model.

This involved alterning the RDF model.

I changed the namespace to something a bit more discriptive.
The information grabbed from the ddf is now attached to the submission
status node, as changing the ddf will change the status.

13 years agoMerge branch 'master' of mus.cacr.caltech.edu:htsworkflow
Diane Trout [Thu, 17 Feb 2011 23:47:17 +0000 (15:47 -0800)]
Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow