Merge branch 'develop' into 'master'

[release] Regular merge of develop

See merge request !534

cards.md

@@ -70,6 +70,7 @@ order: -1
 			<li><a href="{{ 'external/exchange-channels/calendar' | relative_url }}">Sharing calendar in Microsoft Exchange</a></li>
 			<li><a href="{{ 'external/exchange-channels/asperaweb' | relative_url }}">AsperaWEB Quick Guide</a></li>
 			<li><a href="{{ 'external/exchange-channels/owncloud' | relative_url }}">Owncloud</a></li>
+			<li><a href="{{ 'external/exchange-channels/cryptomator' | relative_url }}">Cryptomator</a></li>
 		</ul>
 	</div>
 	<div class="index-box noborderbox" id="general-card">
@@ -89,7 +90,6 @@ order: -1
 		<ul>
 			<li><a href="{{ 'external/integrity/checksum' | relative_url }}">Ensuring Integrity of Data Files with Checksums</a></li>
 			<li><a href="{{ 'external/integrity/dmp' | relative_url }}">Data Management Plan</a></li>
-			<li><a href="{{ 'external/integrity/encryption/cloud' | relative_url }}">Data upload to cloud</a></li>
 			<li><a href="{{ 'external/integrity/encryption/disk' | relative_url }}">Encrypting the Startup Disk for Your Laptop/Desktop</a></li>
 			<li><a href="{{ 'external/integrity/encryption/file' | relative_url }}">Encrypting Files and Folders</a></li>
 			<li><a href="{{ 'external/integrity/naming' | relative_url }}">Naming files</a></li>
@@ -104,10 +104,13 @@ order: -1
 		<ul>
 			<li><a href="{{ 'external/lab-equipment/cryostorage' | relative_url }}">Utilization of the cryostorage</a></li>
 			<li><a href="{{ 'external/lab-equipment/dishwasher-utilization-and-maintenance' | relative_url }}">Dishwasher utilization and maintenance</a></li>
+			<li><a href="{{ 'external/lab-equipment/electric-car' | relative_url }}">LCSB Electric Car</a></li>
 			<li><a href="{{ 'external/lab-equipment/hoods' | relative_url }}">Laminar Flow - Fume Hood - Biosafety Cabinet: what are the differences and when to use them?</a></li>
+			<li><a href="{{ 'external/lab-equipment/incubators' | relative_url }}">Maintenance of incubators</a></li>
 			<li><a href="{{ 'external/lab-equipment/lightcycler' | relative_url }}">How to leave virtual instrument mode on the LightCycler</a></li>
 			<li><a href="{{ 'external/lab-equipment/maintenance-of-fridges' | relative_url }}">Maintenance of fridges and freezers</a></li>
 			<li><a href="{{ 'external/lab-equipment/maintenance_of_cold_traps' | relative_url }}">Maintenance of cold traps  </a></li>
+			<li><a href="{{ 'external/lab-equipment/power-consumption' | relative_url }}">Equipment power consumption</a></li>
 			<li><a href="{{ 'external/lab-equipment/utilization-of-autoclaves' | relative_url }}">Utilization of autoclaves</a></li>
 			<li><a href="{{ 'external/lab-equipment/utilization-of-balances' | relative_url }}">Utilization of balances</a></li>
 			<li><a href="{{ 'external/lab-equipment/utilization-of-bsc' | relative_url }}">Biosafety Cabinets: good practices</a></li>
@@ -123,6 +126,7 @@ order: -1
 			<li><a href="{{ 'external/lab-hsa/lab-coats' | relative_url }}">Lab coats</a></li>
 			<li><a href="{{ 'external/lab-hsa/personal-alert-safety-system' | relative_url }}">Personal alert safety system (PASS)</a></li>
 			<li><a href="{{ 'external/lab-hsa/pictograms' | relative_url }}">Pictograms</a></li>
+			<li><a href="{{ 'external/lab-hsa/ppe' | relative_url }}">Personal Protective Equipment (PPE)</a></li>
 			<li><a href="{{ 'external/lab-hsa/shipment' | relative_url }}">Shipment of biological or chemical samples with carrier</a></li>
 			<li><a href="{{ 'external/lab-hsa/spill' | relative_url }}">Spill in a laboratory</a></li>
 			<li><a href="{{ 'external/lab-hsa/spill-bsc' | relative_url }}">How to deal with a spill in a BSC</a></li>

external/exchange-channels/lft/lft.md

@@ -99,10 +99,6 @@ And follow instructions there. Export variables and execute the command to downl
 
 You can use the official [IBM Aspera Diagnostic Tool](https://test-connect.asperasoft.com/) to troubleshoot your connectivity issues.
 
-### Using Microsoft Edge browser
-
-Microsoft Edge browser requires to download and install [IBM Aspera Connect for Edge](https://microsoftedge.microsoft.com/addons/detail/ibm-aspera-connect/kbffkbiljjejklcpnfmoiaehplhcifki).
-
 ### UDP/TCP port and firewall
 
 > **IMPORTANT:** Aspera requires UDP ports to be enabled on firewalls.
@@ -114,6 +110,14 @@ Specifically your firewall should:
 
 Detailed information on how to configure firewalls when working with Aspera is given [here](https://download.asperasoft.com/download/docs/p2p/3.5.1/p2p_admin_win/webhelp/dita/configuring_the_firewall.html).
 
+### Using Microsoft Edge browser
+
+Microsoft Edge browser requires to download and install [IBM Aspera Connect for Edge](https://microsoftedge.microsoft.com/addons/detail/ibm-aspera-connect/kbffkbiljjejklcpnfmoiaehplhcifki).
+
+### Error "Passphrase doesn't match"
+
+You are using wrong encryption passphrase. Check that you use the encryption passphrase from the correct link, update variables in your script, if any.
+
 ### Command-Line error "command not found: ascp" ###
 
 Run `ascli config ascp show` to show path of `ascp`.

external/integrity/encryption/cloud/cloud.md

----
-layout: page
-permalink: /external/integrity/encryption/cloud/
-shortcut: integrity:encryption:cloud
-redirect_from:
-  - /cards/integrity:encryption:cloud
-  - /external/cards/integrity:encryption:cloud
-  - /integrity/encryption/cloud
-  - /external/external/integrity/encryption/cloud/
----
-
-# Data upload to cloud
-
-Data encryption and hash-check for uploading to UL-LCSB onedrive or owncloud from Windows.
-
-| Requirements | Restrictions |
-| ------ | ------ |
-| Windows 8 or newer (recommended Windows 10) | Recommended for data size less than 100 GB |
-| RAM 2GB (recommended 4GB) | If transfer through Aspera is not possible |
-| Enough free disc space (data will be duplicated for encryption) | Larger data will take more time to encrypt |
-| Administrative rights to install software |  |
-| Web browser (Firefox, Edge or Chrome) |  |
-
-## Install `7zip` for encryption
-
-Download and install `7zip` from [here](https://www.7-zip.org/)
-
-## Install tool for MD5 checksum calculation
-
-1. Search Microsoft Store for `Simple Checksum Calculator` or go to this [link](https://www.microsoft.com/en-us/p/simple-checksum-calculator/9nblggh5l6t9?activetab=pivot:overviewtab)
-2. Install `Simple Checksum Calculator`
-
-
-## Encrypt your data with `7zip`
-
-1. Right click on the folder to encrypt > 7zip > Add to archive
-2. Select following values:
-   - Archive format: `zip`
-   - Compression: `store`
-   - Check `Show Password` box
-   - Encryption: `AES256`
-3. Enter a password and make a copy of the encryption password :key:
-4. Click save to save the encrypted zip file
-
-![](media/7zip-encryption-windows.mp4?width=400)
-
-## Calculate the MD5 checksum with `Simple Checksum Calculator`
-
-1. Open `Simple Checksum Calculator` from the start-menu
-2. Select `File` tab from the top menu
-3. Click on the file icon box in the left panel and load the encrypted zip file
-4. Make a copy of the MD5 checksum key :label:
-
-![](media/Get_MD5_checksum_windows.mp4)
-
-## Data upload
-
-1. Open the `OneDrive` or `ownCloud` URL link that you have received from UL-LCSB contact
-2. Upload the encrypted zip file
-3. After the upload completion, open [UNILU privatebin](https://hpc.uni.lu/privatebin/)
-4. Paste the **encryption password :key:** and **MD5 checksum :label:** in the Editor box and press send
-5. Copy the privatebin URL and send it your UL-LCSB contact through email
\ No newline at end of file

external/lab-equipment/power-consumption/power-consumption.md

+---
+layout: page
+permalink: /external/lab-equipment/power-consumption/
+shortcut: lab:power-consumption
+redirect_from:
+  - /cards/lab-equipment:power-consumption
+  - /external/cards/lab-equipment:power-consumption
+  - /lab/power-consumption
+  - /external/external/lab-equipment/power-consumption/
+  - /cards/lab:power-consumption
+  - /external/cards/lab:power-consumption
+---
+
+# Equipment power consumption
+
+As part of the My Green Lab certification and with the aim of reducing our electricity consumption, 
+we have launched a campaign to raise awareness regarding the electricity consumption of laboratory equipment. 
+The result is a [list](asset/2022-09-06_powerConsumption.xlsx) showing the power consumption of the main devices on standby and/or in use. 
+These instruments were classified into 4 categories according to their use and in agreement with the users.
+These categories are represented by labels of different colours, 
+affixed directly to the equipment and representing the way to manage the use of this equipment from a power point of view.
+
+When a equipment can be switched off, it is mentioned on the label the amount of Watts saved every hour the instrument is off.
+
+The labels are available at BT1 on the support team desk (5th floor, office 503) and at BT2 on the support team reception desk (1st floor).
+
+If a piece of equipment is not on the list, a measurement can be requested from the [support team](https://service.uni.lu/sp?id=sc_cat_item&sys_id=4afd12541b7bb01035ba993d1d4bcbe7&sysparm_category=4dbd16d01b7bb01035ba993d1d4bcb84). 
+
+## Always on
+This equipment must be permanently switched on, either for reasons of constant use (incubator, fridge, etc.), 
+or because the start-up process consumes a lot of energy, it is preferable from an energy point of view to leave 
+the appliance switched on all the time (ball water bath). This equipment can be switched off if it is not to be used for an extended period. 
+This should be discussed with the various users and with the Instrument Care Team in the case of equipment under monitoring (incubators, fridges, freezers).
+
+<div align="center">
+<img src="img/img1.png" width="20%">
+</div>
+
+## Switch off when not in use
+The device can be simply switched off when not in use and switched on when required.
+
+<div align="center">
+<img src="img/img3.png" width="20%">
+</div>
+
+## On timer
+The appliance is connected to a timer; the switch-on time is specified on the label. 
+Timers can be requested from the Support Team.
+
+<div align="center">
+<img src="img/img2.png" width="20%">
+</div>
+
+## Switch off at the end of the day
+At the end of the day, the appliance can be switched off. The time after which the appliance can be switched off is indicated on the label.
+
+<div align="center">
+<img src="img/img4.png" width="20%">
+</div>
+