Skip to content

Commit

Permalink
Merge branch 'release/1.3.2' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
saramonzon committed May 14, 2019
2 parents f353828 + dffba2e commit 61d1416
Show file tree
Hide file tree
Showing 204 changed files with 44 additions and 2 deletions.
43 changes: 41 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ For installation and usage instructions please refer to the [wiki](https://githu
For any problems or bug reporting please post us an [issue](https://github.com/BU-ISCIII/iSkyLIMS/issues)

## iSkyLIMS Demo
iSkyLIMS demo is available for your convenience, in a virtual machine image, running on VirtualBox.
Download the VM image using with your favorite ftp client with the following information:
iSkyLIMS demo is available for your convenience, in a virtual machine image, running on VirtualBox and as a Singularity container.
Download the VM image and/or the container using with your favorite ftp client with the following information:

```
Server: sftpbioinfo.isciii.es
Expand Down Expand Up @@ -43,3 +43,42 @@ Log into iSkyLIMS with different roles using the following credentials:
- As wetlab manager role the user is **John_manager** and password **iSkyLIMS**
- If you need to login as django administrator type the url http://localhost/admin using user : **admin** and password : **iSkyLIMS**

### Run singularity container. (BETA - this method will be improved shorty, but it works for now)

1. First you need to have installed singularity. Please follow [vendor instructions](https://www.sylabs.io/guides/3.0/user-guide/installation.html#install-the-centos-rhel-package-using-yum). We recommend using epel package installation as 2.6 version of singularity is enough for our purposes.

2. Shell into the container (you need to use sudo).

```Bash
sudo singularity shell iskylims.simg
```
3. Start needed services

```Bash
service smbd start
service mysql start
apachectl -D FOREGROUND
# If you want to play with the image you can execute this last command in foreground.
apachectl -D FOREGROUND &
```
4. Open your preferred browser (Firefox or Chome) and type:

```
localhost
```
iSkyLIMS website will be shown!! You can explore the website using this two users:
- bioinfoadm: user inside WetlabManager and Admin_iSkyLIMS groups with manager permissions. (**passwd:**"iskylims")
- regular_user01 and regular_user02: regular users with regular permissions.

With bioinfoadm user you can access Admin panel:
```
localhost/admin
```
There you can access User table and change regular_user01 and regular_user02 passwords.

5. Don't forguet to stop the services before exiting the container, it will prevent possible conflicts with your local installation.
```Bash
service smbd stop
service mysql stop
apachectl stop
```
1 change: 1 addition & 0 deletions conf/dump_errors.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"model": "iSkyLIMS_wetlab.runerrors", "pk": 1, "fields": {"errorCode": "0", "errorText": "No Error"}}, {"model": "iSkyLIMS_wetlab.runerrors", "pk": 2, "fields": {"errorCode": "1", "errorText": "Invalid Sample Sheet"}}, {"model": "iSkyLIMS_wetlab.runerrors", "pk": 3, "fields": {"errorCode": "2", "errorText": "Application Unknown"}}, {"model": "iSkyLIMS_wetlab.runerrors", "pk": 4, "fields": {"errorCode": "4", "errorText": "Experiment name already exists"}}, {"model": "iSkyLIMS_wetlab.runerrors", "pk": 5, "fields": {"errorCode": "5", "errorText": "Project name already exists"}}, {"model": "iSkyLIMS_wetlab.runerrors", "pk": 6, "fields": {"errorCode": "6", "errorText": "User not defined"}}, {"model": "iSkyLIMS_wetlab.runerrors", "pk": 7, "fields": {"errorCode": "7", "errorText": "Empty Experiment name in Sample Sheet"}}, {"model": "iSkyLIMS_wetlab.runerrors", "pk": 8, "fields": {"errorCode": "8", "errorText": "Time expiration for including Sample Sheet in the run"}}, {"model": "iSkyLIMS_wetlab.runerrors", "pk": 9, "fields": {"errorCode": "9", "errorText": "Time expiration for completion of the run"}}, {"model": "iSkyLIMS_wetlab.runerrors", "pk": 10, "fields": {"errorCode": "10", "errorText": "Project not defined in database"}}, {"model": "iSkyLIMS_wetlab.runerrors", "pk": 11, "fields": {"errorCode": "11", "errorText": "Unable to store data in \"RawDemuxStats\" database"}}, {"model": "iSkyLIMS_wetlab.runerrors", "pk": 12, "fields": {"errorCode": "12", "errorText": "Unable to fetch Demultiplexing Stats files"}}, {"model": "iSkyLIMS_wetlab.runerrors", "pk": 13, "fields": {"errorCode": "13", "errorText": "Unable to store data in \"SamplesInProject\" database"}}, {"model": "iSkyLIMS_wetlab.runerrors", "pk": 14, "fields": {"errorCode": "14", "errorText": "Unable to store data in \"StatsFlSummary\" database"}}, {"model": "iSkyLIMS_wetlab.runerrors", "pk": 15, "fields": {"errorCode": "15", "errorText": "Unable to store data in \"StatsLaneSummary\" database"}}, {"model": "iSkyLIMS_wetlab.runerrors", "pk": 16, "fields": {"errorCode": "16", "errorText": "Unable to store data in \"RawTopUnknowBarcodes\" database"}}, {"model": "iSkyLIMS_wetlab.runerrors", "pk": 17, "fields": {"errorCode": "17", "errorText": "Unable to fetch folder to get run disk usage"}}, {"model": "iSkyLIMS_wetlab.runerrors", "pk": 18, "fields": {"errorCode": "18", "errorText": "Unable to fetch log files"}}, {"model": "iSkyLIMS_wetlab.runerrors", "pk": 19, "fields": {"errorCode": "19", "errorText": "Unable to fetch Sample Sheet"}}]
1 change: 1 addition & 0 deletions conf/dump_runstates.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"model": "iSkyLIMS_wetlab.runstates", "pk": 1, "fields": {"runStateName": "Pre-Recorded"}}, {"model": "iSkyLIMS_wetlab.runstates", "pk": 2, "fields": {"runStateName": "Recorded"}}, {"model": "iSkyLIMS_wetlab.runstates", "pk": 3, "fields": {"runStateName": "Sample Sent"}}, {"model": "iSkyLIMS_wetlab.runstates", "pk": 4, "fields": {"runStateName": "Processing Run"}}, {"model": "iSkyLIMS_wetlab.runstates", "pk": 5, "fields": {"runStateName": "Processed Run"}}, {"model": "iSkyLIMS_wetlab.runstates", "pk": 6, "fields": {"runStateName": "Processing Bcl2fastq"}}, {"model": "iSkyLIMS_wetlab.runstates", "pk": 7, "fields": {"runStateName": "Processed Bcl2fastq"}}, {"model": "iSkyLIMS_wetlab.runstates", "pk": 8, "fields": {"runStateName": "Completed"}}, {"model": "iSkyLIMS_wetlab.runstates", "pk": 9, "fields": {"runStateName": "Cancelled"}}, {"model": "iSkyLIMS_wetlab.runstates", "pk": 10, "fields": {"runStateName": "Error"}}, {"model": "iSkyLIMS_wetlab.runstates", "pk": 11, "fields": {"runStateName": "Processing Metrics"}}, {"model": "iSkyLIMS_wetlab.runstates", "pk": 12, "fields": {"runStateName": "Processing Demultiplexing"}}]
1 change: 1 addition & 0 deletions conf/pythonPackagesRequired.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@ interop
mysqlclient
paramiko
pysmb
weasyPrint
zinnia-wysiwyg-wymeditor

Binary file added img/customization/admin_add_groups.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
Binary file added img/customization/admin_assign_groups.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/customization/admin_form_create_group.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/customization/admin_user_creation.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/customization/user_registration_form.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/userGuideDrylab/create_file_extensions.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/userGuideDrylab/create_machines.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/userGuideDrylab/create_platforms.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file added img/userGuideDrylab/drylab_manager_main_menu.png
Binary file added img/userGuideDrylab/drylab_ongoing_services.png
Binary file added img/userGuideIntroduction/iSkyLIMS_homepage.png
Binary file removed img/userGuideIntroduction/introductionBody.png
Diff not rendered.
Binary file removed img/userGuideIntroduction/introductionContact.png
Diff not rendered.
Binary file removed img/userGuideIntroduction/introductionFooter.png
Diff not rendered.
Binary file removed img/userGuideIntroduction/introductionHeader.png
Diff not rendered.
Binary file removed img/userGuideIntroduction/introductionLanding.png
Diff not rendered.
Binary file removed img/userGuideIntroduction/introductionRegister.png
Diff not rendered.
Binary file removed img/userGuideIntroduction/introductionUrl.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.

0 comments on commit 61d1416

Please sign in to comment.