Merge branch 'release/2.2.0'

iSkyLIMS_clinic/models.py

@@ -403,6 +403,7 @@ def __str__ (self):
     def get_configuration_value(self):
         return '%s' %(self.configurationValue)
 
+
 '''
 class ClinicProjects (models.Model):
     patientCore_id = models.ForeignKey(

iSkyLIMS_clinic/utils/generic_functions.py

@@ -1,11 +1,26 @@
 from iSkyLIMS_core.fusioncharts.fusioncharts import FusionCharts
 from iSkyLIMS_core.utils.stats_graphics import *
+from iSkyLIMS_clinic.models import ConfigSetting
 
 def check_empty_fields (row_data):
     for data in row_data:
         if data == '':
             return True
     return False
+
+def get_configuration_from_database(configuration_name):
+    '''
+    Description:
+        The function fetch from database the configuration setting value
+    Input:
+        configuration_name      # configuration settings name
+    '''
+    configuration_value = ''
+    if ConfigSetting.objects.filter(configurationName__exact = configuration_name).exists():
+        configuration_settings_obj = ConfigSetting.objects.filter(configurationName__exact = configuration_name).last()
+        configuration_value = configuration_settings_obj.get_configuration_value()
+    return configuration_value
+
 def pending_clinic_samples_for_grafic(pending):
     number_of_pending = {}
     number_of_pending ['DEFINED'] = pending['defined']['length']

iSkyLIMS_clinic/views.py

@@ -19,8 +19,8 @@
 from iSkyLIMS_core.utils.handling_platforms import get_defined_platforms_and_ids
 
 def index(request):
-    #
-    return render(request, 'iSkyLIMS_clinic/index.html')
+    org_name = get_configuration_from_database("ORGANIZATION_NAME")
+    return render(request, 'iSkyLIMS_clinic/index.html', {"organization_name": org_name})
 
 
 @login_required

iSkyLIMS_core/templates/iSkyLIMS_core/footer.html

@@ -41,7 +41,7 @@ <h4>Powered by :</h4>
 		</div>
 		<div class="row">
 			<div class="col-md-2 col-md-offset-5">
-				<p>Version 2.1.0</p>
+				<p>Version 2.2.0</p>
 			</div>
 		</div>
 		<!--// end row -->

iSkyLIMS_drylab/admin.py

@@ -30,7 +30,7 @@ class UploadServiceFileAdmin(admin.ModelAdmin):
 
 
 class AvailableServiceAdmin(DjangoMpttAdmin):
-	list_display=['availServiceDescription']
+	list_display=['availServiceDescription', 'serviceId', 'inUse']
 
 class ResolutionAdmin(admin.ModelAdmin):
 	list_display=('resolutionServiceID','resolutionNumber', 'resolutionState','resolutionDate','resolutionEstimatedDate','resolutionFullNumber','resolutionAsignedUser')

iSkyLIMS_drylab/api/serializers.py

@@ -1,72 +1,97 @@
-
 from rest_framework import serializers
 from django.contrib.auth.models import User
-#from iSkyLIMS_drylab.models import PipelineExternalDataJobs
-#from iSkyLIMS_drylab.models import ParameterPipeline
-from iSkyLIMS_drylab.models import Service , Resolution, RequestedSamplesInServices
-#from iSkyLIMS_wetlab.models import SamplesInProject
+from iSkyLIMS_drylab.models import (
+    Service,
+    Resolution,
+    RequestedSamplesInServices,
+    Delivery
+    )
+
 
-'''
-class ParameterPipelineSerializer (serializers.ModelSerializer):
+class CreateDeliveryPostSerializer(serializers.ModelSerializer):
     class Meta:
-         model = ParameterPipeline
-         fields = '__all__'
-'''
+        model = Delivery
+        fields = ["deliveryResolutionID", "deliveryDate",
+                  "deliveryNotes", "executionStartDate"]
+
 
 class UserIDSerializer(serializers.ModelSerializer):
+
     class Meta:
         model = User
-        fields = ['username','first_name','last_name', 'email']
+        fields = ["username", "first_name", "last_name", "email"]
 
-class ServiceSerializer (serializers.ModelSerializer):
+
+class ServiceSerializer(serializers.ModelSerializer):
     serviceFileExt = serializers.StringRelatedField(many=False)
     serviceUserId = UserIDSerializer(many=False)
     serviceAvailableService = serializers.StringRelatedField(many=True)
 
     class Meta:
         model = Service
-        #fields = '__all__'
-
-        fields = ['pk', 'serviceRequestNumber','serviceStatus', 'serviceUserId','serviceCreatedOnDate',
-            'serviceSeqCenter', 'serviceAvailableService', 'serviceFileExt' , 'serviceNotes']
-
+        fields = [
+            "pk",
+            "serviceRequestNumber",
+            "serviceStatus",
+            "serviceUserId",
+            "serviceCreatedOnDate",
+            "serviceSeqCenter",
+            "serviceAvailableService",
+            "serviceFileExt",
+            "serviceNotes",
+            ]
 
 
 class UpdateResolutionSerializer(serializers.ModelSerializer):
-    resolutionState = serializers.StringRelatedField(many = False)
+    resolutionState = serializers.StringRelatedField(many=False)
+
     class Meta:
         model = Resolution
 
-        fields = ['resolutionNumber','resolutionState']
+        fields = ["resolutionNumber", "resolutionState"]
 
-    def update (self,state_obj):
+    def update(self, state_obj):
         self.resolutionState = state_obj
         self.save()
         return self
 
-'''
-class PipelineExternalDataJobsSerializer (serializers.ModelSerializer):
-     class Meta:
-         model = PipelineExternalDataJobs
-         fields = '__all__'
 
-class PipelineExternalDataJobsBSerializer (serializers.ModelSerializer):
-    class Meta:
-         model = PipelineExternalDataJobs
-         fields =  ['serviceRequestNumber','jobState']
+class CustomAvailableServiceField(serializers.RelatedField):
+    def to_representation(self, service):
+        data = {"availServiceDescription": service.availServiceDescription}
+        if service.serviceId:
+            data["serviceId"] = service.serviceId
+        else:
+            data["serviceId"] = None
+        return data
+
 
-'''
 class ResolutionSerializer(serializers.ModelSerializer):
-    resolutionServiceID = serializers.StringRelatedField(many = False)
-    resolutionPipelines = serializers.StringRelatedField(many = True)
-    resolutionServiceID = ServiceSerializer(many = False)
+    # resolutionServiceID = serializers.StringRelatedField(many = False)
+    resolutionPipelines = serializers.StringRelatedField(many=True)
+    # esolutionServiceID = ServiceSerializer(many = False)
+    # availableServices = AvailableServicesSerializer(many=True)
+    availableServices = CustomAvailableServiceField(many=True, read_only=True)
+
     class Meta:
         model = Resolution
-        fields = ['pk','resolutionNumber', 'resolutionFullNumber','resolutionServiceID' ,'resolutionDate', 'resolutionEstimatedDate' ,
-            'resolutionOnQueuedDate' , 'resolutionOnInProgressDate' , 'resolutionDeliveryDate' , 'resolutionNotes', 'resolutionPipelines']
+        fields = [
+            "pk",
+            "resolutionNumber",
+            "resolutionFullNumber",
+            "resolutionServiceID",
+            "resolutionDate",
+            "resolutionEstimatedDate",
+            "resolutionOnQueuedDate",
+            "resolutionOnInProgressDate",
+            "resolutionDeliveryDate",
+            "resolutionNotes",
+            "resolutionPipelines",
+            "availableServices",
+            ]
 
-class RequestedSamplesInServicesSerializer(serializers.ModelSerializer):
 
+class RequestedSamplesInServicesSerializer(serializers.ModelSerializer):
     class Meta:
-        model  = RequestedSamplesInServices
-        fields = ['runName', 'projectName', 'sampleName' , 'samplePath']
+        model = RequestedSamplesInServices
+        fields = ["runName", "projectName", "sampleName", "samplePath"]

iSkyLIMS_drylab/api/urls.py

@@ -1,29 +1,14 @@
 from django.urls import path
 from iSkyLIMS_drylab.api import views
-#from . import views
 from rest_framework.urlpatterns import format_suffix_patterns
 app_name = 'iSkyLIMS_drylab_api'
 
 urlpatterns = [
-#     path('jobslist',views.jobs_list, name='jobs_list'),
-#     path('<int:state>/jobsliststate',views.jobs_list_state, name='jobs_list_state'),
-
-    #path('',views.jobs_list, name='jobs_list'),
-    #path('list/<int:state>',views.jobs_list_state, name='jobs_list_state'),
-    #path('update/<str:service>',views.api_update_job, name='api_update_job'),
-    #path('updatestate/<str:service>',views.api_update_state, name='api_update_state'),
-    #path('drylab/api/pipeline/<int:pipeline>',views.get_pipeline, name='get_pipeline'),
-    #path('samples/<str:service>', views.get_samplesinproject, name='get_samplesinproject'),
-
-
     path('services/', views.service_list,  name='service_list'),
-    path('serviceFullData', views.service_full_data, name = 'service_full_data'),
+    path('serviceFullData', views.service_full_data, name='service_full_data'),
+    path('resolutionFullData', views.resolution_full_data, name='resolution_full_data'),
     path('resolution', views.resolution_data, name='resolution_data'),
-    path('samplesInService', views.samples_in_service, name = 'samples_in_service'),
-    path('updateResolution',views.update_resolution_to_in_progress, name = 'update_resolution_to_in_progress'),
-
-
-
-    #path('runfolder/<int:project>', views.get_runfolder,  name='get_runfolder'),
-]
+    path('samplesInService', views.samples_in_service, name='samples_in_service'),
+    path('updateResolution', views.update_resolution, name='update_resolution'),
+    ]
 urlpatterns = format_suffix_patterns(urlpatterns)