Changeset 2151
- Timestamp:
- Nov 26, 2013, 9:52:40 AM (8 years ago)
- Location:
- extensions/net.sf.basedb.reggie/trunk/resources/libprep
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/net.sf.basedb.reggie/trunk/resources/libprep/create_manual_pool.jsp
r2150 r2151 341 341 var mixingStrategy = Forms.getCheckedRadio(frm.mixing_strategy).value; 342 342 343 var numSeparateMix = 0; 344 var numLowQuantity = 0; 345 var numExcluded = 0; 346 343 347 // Get all libs into an array 344 348 var libs = []; … … 362 366 PoolMix.calculateEbVolume(lib, TARGET_MOLARITY_IN_POOL, targetVolumePerLib, mixingStrategy); 363 367 } 368 else 369 { 370 numExcluded++; 371 } 364 372 } 365 373 … … 403 411 setInnerHTML('lib.'+lib.id+'.eb', '-'); 404 412 } 413 if (lib.eb != 0 || mixingStrategy == 'fixed') numSeparateMix++; 414 if (lib.volume > lib.actualVolume) numLowQuantity++; 405 415 } 406 416 … … 440 450 poolData += '</div>'; 441 451 poolDiv.innerHTML = poolData; 452 453 setInnerHTML('num_separate_mix', numSeparateMix); 454 setInnerHTML('num_low_quantity', numLowQuantity); 455 setInnerHTML('num_excluded', numExcluded); 456 442 457 } 443 458 … … 816 831 /> 817 832 </tbl:toolbar> 818 833 819 834 <div id="pool-table" class="bottomborder"> 820 835 <table style="width: 100%;"> … … 830 845 831 846 <div id="lib-table" style="display: none;"> 832 <table class="bottomborder"> 847 <div style="margin: 1em;" class="messagecontainer note"> 848 <base:icon image="info.png"/> 849 <b>Separate mix:</b> <span id="num_separate_mix"></span>, 850 <b>Low quantity:</b> <span id="num_low_quantity"></span>, 851 <b>Excluded:</b> <span id="num_excluded"></span> 852 </div> 853 <table class="bottomborder topborder"> 833 854 <thead> 834 855 <tr> -
extensions/net.sf.basedb.reggie/trunk/resources/libprep/create_pools.jsp
r2150 r2151 432 432 var schema = PoolSchema.getById(libPlate.poolSchema); 433 433 var barcodeVariant = PoolSchema.getBarcodeVariantByName(schema, libPlate.barcodeVariant); 434 435 var numSeparateMix = 0; 436 var numLowQuantity = 0; 437 var numExcluded = 0; 434 438 435 439 for (var poolNo = 0; poolNo < Plate.getPools(); poolNo++) … … 442 446 var well = wells[wellNo]; 443 447 var lib = well.extract; 444 if (lib && !lib.excludeFromPool) 445 { 446 libs[libs.length] = lib; 448 if (lib) 449 { 450 if (lib.excludeFromPool) 451 { 452 numExcluded++; 453 } 454 else 455 { 456 libs[libs.length] = lib; 457 } 447 458 } 448 459 } … … 457 468 var lib = libs[libNo]; 458 469 calculateRemarks(lib, schema, barcodeVariant); 470 if (lib.eb != 0 || mixingStrategy == 'fixed') numSeparateMix++; 471 if (lib.volume > lib.actualVolume) numLowQuantity++; 459 472 } 460 473 … … 490 503 frm['comment.'+poolNo].value = comments; 491 504 } 505 506 setInnerHTML('num_separate_mix', numSeparateMix); 507 setInnerHTML('num_low_quantity', numLowQuantity); 508 setInnerHTML('num_excluded', numExcluded); 492 509 } 493 510 … … 988 1005 </tbl:toolbar> 989 1006 1007 <div style="margin: 1em;" class="messagecontainer note"> 1008 <base:icon image="info.png"/> 1009 <b>Separate mix:</b> <span id="num_separate_mix"></span>, 1010 <b>Low quantity:</b> <span id="num_low_quantity"></span>, 1011 <b>Excluded:</b> <span id="num_excluded"></span> 1012 </div> 1013 990 1014 <table class="plate" style="margin: 1em 1em 1em 1em;" id="plate"> 991 1015 <%
Note: See TracChangeset
for help on using the changeset viewer.