add branch and date in title

diff --git a/front-end/src/component/info-list/index.jsx b/front-end/src/component/info-list/index.jsx
index 681fa2d0a2273419176e38a0ea7ecfb31432e7e4..386369b0c1141347a78d3ff1a214da82a22f34e3 100644 (file)
--- a/front-end/src/component/info-list/index.jsx
+++ b/front-end/src/component/info-list/index.jsx
@@ -33,7 +33,7 @@ class InfoList extends React.Component {
 
                  Item = (
                     <List.Item className='clear-list-style' key={i} value='-'>
-                        <Accordion className='pre' defaultActiveIndex={[0, 0]} panels={panel} exclusive={false} fluid />
+                        <Accordion className='pre' defaultActiveIndex={[]} panels={panel} exclusive={false} fluid />
 
                         {/*<a href='javascript:void(0)' id={'' + child} onClick={() => this.scrollToAnchor('' + child)}>*/}
                             {/*<h3>{'' + child}301</h3></a>*/}

diff --git a/front-end/src/page/detailInfo/index.css b/front-end/src/page/detailInfo/index.css
index 8c9c3b6369fa7e1d70f0f736c354432e1168551c..52c13a2a440dab6e335e40110c1a7a16e119aec9 100644 (file)
--- a/front-end/src/page/detailInfo/index.css
+++ b/front-end/src/page/detailInfo/index.css
@@ -7,7 +7,10 @@
     justify-content:flex-start;
 
     font-weight: 600;
+}
 
+.record-title-top :first-child{
+    padding-right: 89px;
 }
 
 .card-container{

diff --git a/front-end/src/page/detailInfo/index.jsx b/front-end/src/page/detailInfo/index.jsx
index 61a1ef8348d595a5835234e2c8281d0d7ca3d0d0..3938c229032a6e19952bc53eb99c71d454e3f3ee 100644 (file)
--- a/front-end/src/page/detailInfo/index.jsx
+++ b/front-end/src/page/detailInfo/index.jsx
@@ -43,8 +43,8 @@ class DetailInfo extends React.Component {
     }
 
     render() {
-        let branch =  '';
-        let date =   '';
+        let branch =  this.state.recordInfo.branch || '';
+        let date = this.state.recordInfo.date || '';
         let machine = this.state.recordInfo.test_machine || {};
         let dataset = this.state.recordInfo.dataset_info || {};
         let meta_info = this.state.recordInfo.meta_info || {};

diff --git a/web/apps/test_records/serializer.py b/web/apps/test_records/serializer.py
index 7071c250754c9b42fef3d15dfef966242c3c3e7c..7dd4a7ae84d2b29823ef1e5d5892fd5eb5021cea 100644 (file)
--- a/web/apps/test_records/serializer.py
+++ b/web/apps/test_records/serializer.py
@@ -192,10 +192,12 @@ class TestRecordDetailSerializer(serializers.ModelSerializer):
     '''
     use ModelSerializer
     '''
+    branch = serializers.SerializerMethodField()
+    date = serializers.SerializerMethodField()
     pg_info = PGInfoSerializer()
     linux_info = LinuxInfoDetailSerializer()
     test_machine = UserMachineSerializer()
-    hardware_info = HardwareInfoDetailSerializer()
+    hardware_info = serializers.SerializerMethodField()
     meta_info = MetaInfoDetailSerializer()
 
     dataset_info = serializers.SerializerMethodField()
@@ -204,7 +206,24 @@ class TestRecordDetailSerializer(serializers.ModelSerializer):
     class Meta:
         model = TestRecord
         fields = (
-            'uuid', 'pg_info', 'linux_info', 'hardware_info', 'meta_info', 'dataset_info', 'test_desc', 'meta_time', 'test_machine')
+            'branch', 'date', 'uuid', 'pg_info', 'linux_info', 'hardware_info', 'meta_info', 'dataset_info', 'test_desc', 'meta_time', 'test_machine')
+
+    def get_branch(self, obj):
+        target_pg_info = PGInfo.objects.filter(id=obj.pg_info.id).first()
+        branch_id = target_pg_info.pg_branch_id
+
+        return branch_id
+
+    def get_date(self, obj):
+        target_meta_info = MetaInfo.objects.filter(id=obj.meta_info.id).first()
+
+        return target_meta_info.date
+
+    def get_hardware_info(self, obj):
+        target_data = LinuxInfo.objects.filter(id=obj.linux_info.id).first()
+
+        hardware_info_serializer = HardwareInfoDetailSerializer(target_data)
+        return hardware_info_serializer.data
 
     def get_dataset_info(self, obj):
         dataset_list = TestDataSet.objects.filter(test_record_id=obj.id).values_list('test_cate_id').annotate(