cert reg expr

_attachments/js/index.js

@@ -12,6 +12,7 @@ $( document ).ready(function() {
     }else{
       $no.addClass("selected");
     }
+    window.location.hash = "#"+no;
   });
 
   // Vorgänge mit wechselnden Farben
@@ -52,7 +53,7 @@ $( document ).ready(function() {
           data: JSON.stringify(bur_doc),
           url: bur_url
         }).done(function( up_res ) {
-          window.location.reload()
+          window.location.reload(true)
         });
       });
     });
@@ -74,7 +75,7 @@ $( document ).ready(function() {
         data: JSON.stringify(cert_doc),
         url: cert_url
       }).done(function( up_res ) {
-        window.location.reload()
+        location.href = location.href
       });
     });
   });

templates/body.html

 
-<tr   class="ref_{{OrderNumber}}" data-ref="{{OrderNumber}}">
-  <td class="no_{{Number}}" title="Vorgang" data-row="{{Number}}">
+<tr  href="#{{Number}}" class="ref_{{OrderNumber}}" data-ref="{{OrderNumber}}">
+  <td  class="no_{{Number}}" title="Vorgang" data-row="{{Number}}">
     {{OrderNumber}}
   </td>
   <td class="no_{{Number}}" title="KS" data-row="{{Number}}">
@@ -98,18 +98,6 @@
     {{{DateCertificate}}}
   </td>
 
-  <td class="no_{{Number}}" title="KS-Dateien" data-row="{{Number}}">
-    {{#CertAttachments}}
-    <a target="_blank" href="../../../../{{CertId}}/{{.}}">{{.}}</a>
-     {{/CertAttachments}}
-  </td>
-
-  <td class="no_{{Number}}" title="BUR-Dateien" data-row="{{Number}}">
-    {{#BurAttachments}}
-    <a target="_blank" href="../../../../{{BurId}}/{{.}}">{{.}}</a> 
-     {{/BurAttachments}}
-  </td>
-
   <td class="no_{{Number}}" title="Fakturaanforderung" data-row="{{Number}}">
     <a target="_blank" href="http://a73434.berlin.ptb.de:5984/vl_db/applications/sofa.html?key={{CommonReferenceNo}}">{{Fakturaanforderung}}</a> 
   </td>
@@ -137,11 +125,25 @@
   <td class="ref_{{OrderNumber}} no_{{Number}} {{DateTerminated}}" title="technisch abgeschlossen" data-row="{{Number}}">
      <a target="_blank" href="http://a73434.berlin.ptb.de:5984/vl_db/applications/sofa.html?key={{CommonReferenceNo}}">{{DateTerminated}}</a>
   </td>
+
   <td class="no_{{Number}}" data-row="{{Number}}">
     <a target="_blank" href="mailto:{{ContactEmail}}">{{ContactEmail}}</a>
   </td>
+
   <td class="no_{{Number}}" title="Telefonnummer des Ansprechpartners" data-row="{{Number}}">
     <a target="_blank" href="tel:{{ContactPhone}}"> {{ContactPhone}} </a>
   </td>
 
+  <td class="no_{{Number}}" title="KS-Dateien" data-row="{{Number}}">
+    {{#CertAttachments}}
+    <a target="_blank" href="../../../../{{CertId}}/{{.}}">{{.}}</a>
+     {{/CertAttachments}}
+  </td>
+
+  <td class="no_{{Number}}" title="BUR-Dateien" data-row="{{Number}}">
+    {{#BurAttachments}}
+    <a target="_blank" href="../../../../{{BurId}}/{{.}}">{{.}}</a> 
+     {{/BurAttachments}}
+  </td>
+
 </tr>
\ No newline at end of file

templates/header.html

@@ -98,8 +98,6 @@
               <th>Start Messung</th>
               <th>Datum KS</th>
 
-              <th>KS-Dateien</th>
-              <th>BUR-Dateien</th>
               <th>Fakturaanforderung </th>
               <th>Faktura</th>
 
@@ -111,6 +109,8 @@
 
               <th>Email</th>
               <th>Tel.</th>
+              <th>KS-Dateien</th>
+              <th>BUR-Dateien</th>
             </tr>
           </thead>
           <tbody>
\ No newline at end of file

views/all/map.js

@@ -176,25 +176,27 @@ function(doc) {
     if(dc.Titlepage){
       var dct = dc.Titlepage
         , att = []
-        , spltRefNo = dct.ReferenceNo.split("|")[1]; // need regexpr!
+        , pat = new RegExp('(7.5)-([0-9]?\.[0-9]?)-([0-9]{2})-([0-9]{1,3})-([0-9]{1,3})')
+        , mtch = dct.ReferenceNo.match(pat)
 
-      spltRefNo = spltRefNo.split("-");
-      var OrderNumber         = spltRefNo[spltRefNo.length -1]
-        , CommonReferenceNo   = [commonPrefix, dct.ShortYear,  OrderNumber].join("-")
-        , sortOrderNumber = pad.substring(0, pad.length - OrderNumber.length) + OrderNumber;
+      if( mtch){
+        var OrderNumber         =  mtch[5]
+          , CommonReferenceNo   = [commonPrefix, mtch[3],  OrderNumber].join("-")
+          , sortOrderNumber     = pad.substring(0, pad.length - OrderNumber.length) + OrderNumber;
 
-      if(doc._attachments){
-        for (var a in doc._attachments){
-          att.push(a);
+        if(doc._attachments){
+          for (var a in doc._attachments){
+            att.push(a);
+          }
         }
-      }
 
-      emit(dct.FullYear + "_" +sortOrderNumber,
-           {Certificate: dct.Certificate
-           , Year: dct.FullYear
-           , DateCertificate: dct.CertificateDate
-           , CertAttachments: att
-           , CertId: doc._id} );
+        emit(dct.FullYear + "_" +sortOrderNumber,
+             {Certificate: dct.Certificate
+             , Year: dct.FullYear
+             , DateCertificate: dct.CertificateDate
+             , CertAttachments: att
+             , CertId: doc._id} );
+      }
     }
   }
 }