@@ -173,13 +173,13 @@ def generateFullHTML(self, sMkt, sFit, dnaUrl):
173173</head>
174174<body>
175175<div id="canvas" data-role="page">
176+ <div style="text-align: center;"><strong>Last updated:</strong> %s <small>(<span class="timer"></span>)</small></div>
176177 <div data-role="header">
177- <h1>Pyfa fits</h1>
178+ <h1>Pyfa fits by Group </h1>
178179 </div>
179180 <div data-role="content">
180- <div style="text-align: center;"><strong>Last updated:</strong> %s <small>(<span class="timer"></span>)</small></div>
181-
182181""" % (time .time (), dnaUrl , localDate )
182+
183183 HTML += ' <ul data-role="listview" class="ui-listview-outer" data-inset="true" data-filter="true">\n '
184184 categoryList = list (sMkt .getShipRoot ())
185185 categoryList .sort (key = lambda _ship : _ship .name )
@@ -258,6 +258,68 @@ def generateFullHTML(self, sMkt, sFit, dnaUrl):
258258 HTML += """
259259 </ul>
260260 </div>
261+ <div data-role="header">
262+ <h1>Pyfa fits by Name</h1>
263+ </div>
264+ <div data-role="content">
265+ """
266+ HTML += ' <ul data-role="listview" class="ui-listview-outer" data-inset="true" data-filter="true">\n '
267+ categoryList = list (sMkt .getShipRoot ())
268+ categoryList .sort (key = lambda _ship : _ship .name )
269+
270+ count = 0
271+
272+ for group in categoryList :
273+ # init market group string to give ships something to attach to
274+ HTMLgroup = ''
275+
276+ ships = list (sMkt .getShipList (group .ID ))
277+ ships .sort (key = lambda _ship : _ship .name )
278+
279+ # Keep track of how many ships per group
280+ groupFits = 0
281+ for ship in ships :
282+ fits = sFit .getFitsWithShip (ship .ID )
283+
284+ if len (fits ) > 0 :
285+ groupFits += len (fits )
286+
287+ for fit in fits :
288+ if self .stopRunning :
289+ return
290+ try :
291+ eftFit = Port .exportEft (getFit (fit [0 ]), options = {
292+ PortEftOptions .IMPLANTS : True ,
293+ PortEftOptions .MUTATIONS : True ,
294+ PortEftOptions .LOADED_CHARGES : True ,
295+ PortEftOptions .BOOSTERS : True ,
296+ PortEftOptions .CARGO : True })
297+
298+ HTMLfit = (
299+ ' <li data-role="collapsible" data-iconpos="right" data-shadow="false" '
300+ 'data-corners="false">\n '
301+ ' <h2>' + ship .name + " " + fit [1 ] + '</h2>\n '
302+ ' <ul data-role="listview" data-shadow="false" data-inset="true" '
303+ 'data-corners="false">\n '
304+ )
305+
306+ HTMLfit += ' <li><pre>' + eftFit + '\n </pre></li>\n '
307+
308+ HTMLfit += ' </ul>\n </li>\n '
309+ HTML += HTMLfit
310+ except (KeyboardInterrupt , SystemExit ):
311+ raise
312+ except :
313+ pyfalog .warning ("Failed to export line" )
314+ continue
315+ finally :
316+ if self .progress :
317+ self .progress .current = count
318+ count += 1
319+
320+ HTML += """
321+ </ul>
322+ </div>
261323</div>
262324</body>
263325</html>"""
0 commit comments