Alejandro Granados 6 年之前
父节点
当前提交
fdb51a3361

+ 1 - 0
_gitignore

@@ -15,6 +15,7 @@ user_guide_src/cilexer/build/*
 user_guide_src/cilexer/dist/*
 user_guide_src/cilexer/pycilexer.egg-info/*
 /vendor/
+/system_files/firmas_generadas/*
 
 # IDE Files
 #-------------------------

+ 326 - 301
application/controllers/FirmaController.php

@@ -269,39 +269,42 @@ class FirmaController extends CI_Controller {
 		if($persona['Plantilla']=='MER'){
 			$style ="
 			@font-face{
-				font-family:GOTHICBI;
-				src:url(../Tipografias/GOTHICB.ttf);
+				font-family:HelveticaNeueLTStd-Lt;
+				src:url(../Tipografias/HelveticaNeueLTStd-Lt.otf);
 				}
 
 				font{
-					font-family: GOTHICBI;
+					font-family: Helvetica, sans-serif;
 				}
 				
 				td{
-					font-family: GOTHICBI;
+					font-family: Helvetica, sans-serif;
 				}
 				
 				.merelec_name_yellow{
-					font-family: GOTHICBI;
+					font-family: Helvetica, sans-serif;
 					color: #FCB122;
-					font-size: 15pt;
+					font-size: 14pt;
+					font-weight: bold;
 				}
 				
 				.merelec_name_gray{
-					font-family: GOTHICBI;
+					font-family: Helvetica, sans-serif;
 					color: #80888F;
-					font-size: 15pt;
+					font-size: 14pt;
+					font-weight: bold;
 				}
 				
 				.merelec_puesto{
-					font-family: GOTHICBI;
+					font-family: Helvetica, sans-serif;
 					color: #80888F;
-					font-size: 15pt;
+					font-size: 14pt;
 				}
 				
 				.merelec_yellow_text{
 				color: #FCB122;
 				font-size: 12pt;
+				font-weight: bold;
 				}
 				
 				.merelec_gray_text{
@@ -310,71 +313,70 @@ class FirmaController extends CI_Controller {
 				}				
 				";
 
-				$body = "
-				  <table>
-					<tbody>
-					  <tr>
-						<td colspan=\"2\">
-						  <span class=\"merelec_name_yellow\">".$persona['Primer Nombre']."</span> <span class=\"merelec_name_gray\">".$persona['Primer Apellido']."</span>
-						  <p style=\"margin-top:1%\"><span class=\"merelec_puesto\">".$persona['Puesto']."</span></p>
-						</td>
-					  </tr>
-				
-					  <tr>
-						<td width=\"200\" style=\"border-right:2px solid #80888F;\">
-						  <img src=\"https://www.mercadoselectricos.com.sv/wp-content/uploads/2019/12/IMG_MER_Logo.png\" width=\"200\" height=\"83\">
-						</td>
-						<td width=\"900\" style=\"margin-left:2px;\">
-						  <table>
-							<tbody>
-							  <tr align=\"left\">
-								<td>
-								  <span style=\"color: #80888F\"><span class=\"merelec_yellow_text\">T.</span><span class=\"merelec_gray_text\">".$persona['Telefono']."</span> &nbsp;
-								  <span class=\"merelec_yellow_text\">C.</span><span class=\"merelec_gray_text\">".$persona['Celular']."</span></span>
-								</td>
-							  </tr>
-							  <tr>
-								<td>
-								  <a href=\"mailto:".$persona['Correo']."\"><span class=\"merelec_yellow_text\">".$email_id."</span><span class=\"merelec_gray_text\">@".$email_domain."</span></a>
-								</td>
-							  </tr>
-							  <tr>
-								<td>
-								  <a href=\"https://www.".$persona['LinkedIn']."\"> <span class=\"merelec_gray_text\">".$site."/".$type."/"."</span><span class=\"merelec_yellow_text\">".$identifier."</span></a>
-								</td>
-							  </tr>
-							  <tr>
-								<td>
-								  <table>
-									<tr>
-									  <td>
-										<a class=\"social_media\" href=\"https://www.linkedin.com/company/mercados-electricos-centroamerica/\">
-										  <img width=\"20\" height=\"20\" src=\"https://www.mercadoselectricos.com.sv/wp-content/uploads/2019/12/IMG_MER_Linkedin.png\">
-										</a>
-									  </td>
-									  <td>
-										<a class=\"social_media\" href=\"https://www.facebook.com/MercadosElectricosCentroamerica/\">
-										  <img width=\"20\" height=\"20\"  src=\"https://www.mercadoselectricos.com.sv/wp-content/uploads/2019/12/IMG_MER_Facebook.png\">
-										</a>
-									  </td>
-									  <td>
-										<a class=\"social_media\" href=\"https://www.mercadoselectricos.com.sv\">
-										  <span class=\"merelec_gray_text\">www.</span><span class=\"merelec_yellow_text\">mercadoselectricos</span><span class=\"merelec_gray_text\">.com.sv</span>
-										</a>
-									  </td>
-									</tr>
-								  </table>
-								</td>
-							  </tr>
-							</tbody>
-						  </table>
-						</div>
-					  </td>
-					</tr>
-				  </tbody>
-				</table>
-				</body>
-				</html>";
+$body = "  <table>
+<tbody>
+  <tr>
+	<td colspan=\"2\">
+	  <span class=\"merelec_name_yellow\">".$persona['Primer Nombre']."</span> <span class=\"merelec_name_gray\">".$persona['Primer Apellido']."</span>
+	  <p style=\"margin-top:1%\"><span class=\"merelec_puesto\">".$persona['Puesto']."</span></p>
+	</td>
+  </tr>
+  <tr height=\"10\"></tr>
+  <tr>
+	<td width=\"200\" style=\"border-right:2px solid #80888F;\">
+	  <img src=\"https://www.mercadoselectricos.com.sv/wp-content/uploads/2019/12/IMG_MER_Logo.png\" width=\"200\" height=\"83\">
+	</td>
+	<td width=\"900\" style=\"margin-left:2px;\">
+	  <table>
+		<tbody>
+		  <tr align=\"left\">
+			<td>
+			  <span style=\"color: #80888F\"><span class=\"merelec_yellow_text\">T.</span><span class=\"merelec_gray_text\">".$persona['Telefono']."</span> &nbsp;
+			  <span class=\"merelec_yellow_text\">C.</span><span class=\"merelec_gray_text\">".$persona['Celular']."</span></span>
+			</td>
+		  </tr>
+		  <tr>
+			<td>
+			  <a href=\"mailto:".$persona['Correo']."\"><span class=\"merelec_yellow_text\">".$email_id."</span><span class=\"merelec_gray_text\">@".$email_domain."</span></a>
+			</td>
+		  </tr>
+		  <tr>
+			<td>
+			  <a href=\"https://www.".$persona['LinkedIn']."\"> <span class=\"merelec_gray_text\">".$site."/".$type."/"."</span><span class=\"merelec_yellow_text\">".$identifier."</span></a>
+			</td>
+		  </tr>
+		  <tr>
+			<td>
+			  <table>
+				<tr>
+				  <td>
+					<a class=\"social_media\" href=\"https://www.linkedin.com/company/mercados-electricos-centroamerica/\">
+					  <img width=\"20\" height=\"20\" src=\"https://www.mercadoselectricos.com.sv/wp-content/uploads/2019/12/IMG_MER_Linkedin.png\">
+					</a>
+				  </td>
+				  <td>
+					<a class=\"social_media\" href=\"https://www.facebook.com/MercadosElectricosCentroamerica/\">
+					  <img width=\"20\" height=\"20\"  src=\"https://www.mercadoselectricos.com.sv/wp-content/uploads/2019/12/IMG_MER_Facebook.png\">
+					</a>
+				  </td>
+				  <td>
+					<a class=\"social_media\" href=\"https://www.mercadoselectricos.com.sv\">
+					  <span class=\"merelec_gray_text\">www.</span><span class=\"merelec_yellow_text\">mercadoselectricos</span><span class=\"merelec_gray_text\">.com.sv</span>
+					</a>
+				  </td>
+				</tr>
+			  </table>
+			</td>
+		  </tr>
+		</tbody>
+	  </table>
+
+	</td>
+  </tr>
+</tbody>
+</table>
+</body>
+</html>";
 			
 		}elseif($persona['Plantilla']=='INVER'){
 			$style = "@font-face{
@@ -383,98 +385,108 @@ class FirmaController extends CI_Controller {
 				}
 				
 				.inverlec_name_blue{
-					font-family: HelveticaNeueLTStd-Lt;
-					color: #436DAA;
+					font-family: Helvetica, sans-serif;
+					color: #00ABE7;
 					font-size: 16px;
+					font-weight:bold;
 				}
 				.inverlec_name_black{
-				  font-family: HelveticaNeueLTStd-Lt;
+				font-family: Helvetica, sans-serif;
 				  color: black;
 				  font-size: 16px;
+				  font-weight:bold;
 				}
+
+				.inverlec_puesto{
+					font-family: Helvetica, sans-serif;
+					color: black;
+					font-size: 16px;
+				  }
+
 				td{
-					font-family: HelveticaNeueLTStd-Lt;
+					font-family: Helvetica, sans-serif;
 				}
 				
 				.inverlec_blue_text{
-				color: #436DAA;
-				font-family: HelveticaNeueLTStd-Lt;
-				font-size: 14px;
+				color: #00ABE7;
+				font-family: Helvetica, sans-serif;
+				font-size: 15px;
+				font-weight:bold;
 				}
 				
 				.inverlec_black_text{
 				color: black;
-				font-family: HelveticaNeueLTStd-Lt;
-				font-size: 14px;
+				font-family: Helvetica, sans-serif;
+				font-size: 15px;
 				}
 				 ";
 
-				 $body="  <table>
-				 <tbody>
-				   <tr>
-					 <td colspan=\"2\">
-					   <span class=\"inverlec_name_blue\">".$persona['Primer Nombre']."</span> <span class=\"inverlec_name_black\">".$persona['Primer Apellido']."</span>
-					   <p style=\"margin-top:1%\"><span class=\"inverlec_name_black\">".$persona['Puesto']."</span></p>
-					 </td>
-				   </tr>
-			 
-				   <tr>
-					 <td width=\"160\" style=\"border-right:2px solid #436DAA;\">
-					   <img src=\"https://www.mercadoselectricos.com.sv/wp-content/uploads/2019/12/IMG_INVER_Logo.png\" width=\"160\" height=\"90\">
-					 </td>
-					 <td width=\"900\" style=\"margin-left:2px;\" >
-					   <table>
-						 <tbody>
-						   <tr align=\"left\">
-							 <td>
-							   <span style=\"color: #80888F\"><span class=\"inverlec_blue_text\">T.</span><span class=\"inverlec_black_text\">".$persona['Telefono']."</span> &nbsp;
-							   <span class=\"inverlec_blue_text\">C.</span><span class=\"inverlec_black_text\">".$persona['Celular']."</span></span>
-							 </td>
-			 
-						   </tr>
-						   <tr>
-							 <td>
-							   <a href=\"mailto:".$persona['Correo']."\"><span class=\"inverlec_blue_text\">".$email_id."</span><span class=\"inverlec_black_text\">@".$email_domain."</span></a>
-							 </td>
-						   </tr>
-						   <tr>
-							 <td>
-							   <a href=\"https://www.".$persona['LinkedIn']."\"> <span class=\"inverlec_black_text\">".$site."/".$type."/"."</span><span class=\"inverlec_blue_text\">".$identifier."</span></a>
-							 </td>
-						   </tr>
-						   <tr>
-							 <td>
-							   <table>
-								 <tr>
-								   <td>
-									 <a class=\"social_media\" href=\"https://www.linkedin.com/company/inverlecsv/\">
-									   <img width=\"20\" height=\"20\" src=\"https://www.mercadoselectricos.com.sv/wp-content/uploads/2019/12/IMG_INVER_Linkedin.png\">
-									 </a>
-								   </td>
-								   <td>
-									 <a class=\"social_media\" href=\"https://www.facebook.com/Inverlecsv/\">
-									   <img width=\"20\" height=\"20\"  src=\"https://www.mercadoselectricos.com.sv/wp-content/uploads/2019/12/IMG_INVER_Facebook.png\">
-									 </a>
-								   </td>
-								   <td>
-									 <a class=\"social_media\" href=\"https://www.inverlec.com.sv\">
-									   <span class=\"inverlec_black_text\">www.</span><span class=\"inverlec_blue_text\">inverlec</span><span class=\"inverlec_black_text\">.com.sv</span>
-									 </a>
-								   </td>
-								 </tr>
-							   </table>
-							 </td>
-						   </tr>
-						 </tbody>
-					   </table>
-			 
-					 </td>
-				   </tr>
-				 </tbody>
-			   </table>
-			 </body>
-			 </html>
-			 ";
+	$body="<table>
+    <tbody>
+      <tr>
+        <td colspan=\"2\">
+          <span class=\"inverlec_name_blue\">".$persona['Primer Nombre']."</span> <span class=\"inverlec_name_black\">".$persona['Primer Apellido']."</span>
+          <p style=\"margin-top:1%\"><span class=\"inverlec_puesto\">".$persona['Puesto']."</span></p>
+        </td>
+      </tr>
+      <tr height=\"10\"></tr>
+      <tr>
+        <td width=\"160\" style=\"border-right:2px solid #00ABE7;\">
+          <img src=\"https://www.mercadoselectricos.com.sv/wp-content/uploads/2019/12/IMG_INVER_Logo.png\" width=\"160\" height=\"90\">
+        </td>
+        <td width=\"900\" style=\"margin-left:2px;\" >
+          <table>
+            <tbody>
+              <tr align=\"left\">
+                <td>
+                  <span style=\"color: #80888F\"><span class=\"inverlec_blue_text\">T.</span><span class=\"inverlec_black_text\">".$persona['Telefono']."</span> 
+                  <span class=\"inverlec_blue_text\">C.</span><span class=\"inverlec_black_text\">".$persona['Celular']."</span></span>
+                </td>
+
+              </tr>
+              <tr>
+                <td>
+                  <a href=\"mailto:".$persona['Correo']."\"><span class=\"inverlec_blue_text\">".$email_id."</span><span class=\"inverlec_black_text\">@".$email_domain."</span></a>
+                </td>
+              </tr>
+              <tr>
+                <td>
+                  <a href=\"https://www.".$persona['LinkedIn']."\"> <span class=\"inverlec_black_text\">".$site."/".$type."/"."</span><span class=\"inverlec_blue_text\">".$identifier."</span></a>
+                </td>
+              </tr>
+              <tr>
+                <td>
+                  <table>
+                    <tr>
+                      <td>
+                        <a class=\"social_media\" href=\"https://www.linkedin.com/company/inverlecsv/\">
+                          <img width=\"20\" height=\"20\" src=\"https://www.mercadoselectricos.com.sv/wp-content/uploads/2019/12/IMG_INVER_Linkedin.png\">
+                        </a>
+                      </td>
+                      <td>
+                        <a class=\"social_media\" href=\"https://www.facebook.com/Inverlecsv/\">
+                          <img width=\"20\" height=\"20\"  src=\"https://www.mercadoselectricos.com.sv/wp-content/uploads/2019/12/IMG_INVER_Facebook.png\">
+                        </a>
+                      </td>
+                      <td>
+                        <a class=\"social_media\" href=\"https://www.inverlec.com.sv\">
+                          <span class=\"inverlec_black_text\">www.</span><span class=\"inverlec_blue_text\">inverlec</span><span class=\"inverlec_black_text\">.com.sv</span>
+                        </a>
+                      </td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+
+        </td>
+      </tr>
+    </tbody>
+  </table>
+</body>
+</html>
+";
 
 		}elseif($persona['Plantilla']=='INVERSOL'){
 			$style = "
@@ -483,95 +495,104 @@ class FirmaController extends CI_Controller {
 				src:url(../Tipografias/HelveticaNeueLTStd-Lt.otf);
 				  }
 				  .inversol_name_yellow{
-					font-family: HelveticaNeueLTStd-Lt;
+					font-family: Helvetica, sans-serif;
 					color: #F78D27;
 					font-size: 16px;
+					font-weight: bold;
 				}
 				.inversol_name_black{
-				  font-family: HelveticaNeueLTStd-Lt;
+					font-family: Helvetica, sans-serif;
 				  color: black;
 				  font-size: 16px;
+				  font-weight: bold;
 				}
+				.inversol_puesto{
+					font-family: Helvetica, sans-serif;
+					color: black;
+					font-size: 16px;
+				  }
 				td{
-					font-family: HelveticaNeueLTStd-Lt;
+					font-family: Helvetica, sans-serif;
 				}
 			
 			  .inversol_yellow_text{
 				color: #F78D27;
-				font-family: HelveticaNeueLTStd-Lt;
-				font-size: 14px;
+				font-family: Helvetica, sans-serif;
+				font-size: 15px;
+				font-weight: bold;
 			  }
 			
 			  .inversol_black_text{
 				color: black;
-				font-family: HelveticaNeueLTStd-Lt;
-				font-size: 14px;
+				font-family: Helvetica, sans-serif;
+				font-size: 15px;
 			  }
 			";
 			
-			$body = "  <table>
-			<tbody>
-			  <tr>
-				<td colspan=\"2\">
-				  <span class=\"inversol_name_yellow\">".$persona['Primer Nombre']."</span> <span class=\"inversol_name_black\">".$persona['Primer Apellido']."</span>
-				  <p style=\"margin-top:1%\"><span class=\"inversol_name_black\">".$persona['Puesto']."</span></p>
-				</td>
-			  </tr>
-		
-			  <tr>
-				<td width=\"160\" style=\"border-right:2px solid #FBAB20;\">
-				  <img src=\"https://www.mercadoselectricos.com.sv/wp-content/uploads/2019/12/IMG_INVERSOL_Logo.png\" width=\"160\" height=\"100\">
-				</td>
-				<td width=\"900\" style=\"margin-left:2px;\">
-				  <table>
-					<tbody>
-					  <tr align=\"left\">
-						<td>
-						  <span style=\"color: #80888F\"><span class=\"inversol_yellow_text\">T.</span><span class=\"inversol_black_text\">".$persona['Telefono']."</span> &nbsp;
-						  <span class=\"inversol_yellow_text\">C.</span><span class=\"inversol_black_text\">".$persona['Celular']."</span></span>
-						</td>
-					  </tr>
-					  <tr>
-						<td>
-						  <a href=\"mailto:".$persona['Correo']."\"><span class=\"inversol_yellow_text\">".$email_id."</span><span class=\"inversol_black_text\">@".$email_domain."</span></a>
-						</td>
-					  </tr>
-					  <tr>
-						<td>
-						  <a href=\"https://www.".$persona['LinkedIn']."\"> <span class=\"inversol_black_text\">".$site."/".$type."/"."</span><span class=\"inversol_yellow_text\">".$identifier."</span></a>
-						  </td>
-						  </tr>
-						  <tr>
-							<td>
-							  <table>
-								<tr>
-								  <td>
-									<a class=\"social_media\" href=\"https://www.linkedin.com/company/inverlecsolar/\">
-									  <img width=\"20\" height=\"20\" src=\"https://www.mercadoselectricos.com.sv/wp-content/uploads/2019/12/IMG_INVERSOL_Linkedin.png\">
-									</a>
-								  </td>
-								  <td>
-									<a class=\"social_media\" href=\"https://www.facebook.com/inverlec/\">
-									  <img width=\"20\" height=\"20\"  src=\"https://www.mercadoselectricos.com.sv/wp-content/uploads/2019/12/IMG_INVERSOL_Facebook.png\">
-									</a>
-								  </td>
-								  <td>
-									<a class=\"social_media\" href=\"https://www.inverlec.solar\">
-									  <span class=\"inversol_black_text\">www.</span><span class=\"inversol_yellow_text\">inverlec</span><span class=\"inversol_black_text\">.solar</span>
-									</a>
-								  </td>
-								</tr>
-							  </table>
-							</td>
-						  </tr>
-						</tbody>
-					  </table>
-					</td>
-				  </tr>
-				</tbody>
+$body = "<table>
+<tbody>
+  <tr>
+	<td colspan=\"2\">
+	  <span class=\"inversol_name_yellow\">".$persona['Primer Nombre']."</span> <span class=\"inversol_name_black\">".$persona['Primer Apellido']."</span>
+	  <p style=\"margin-top:1%\"><span class=\"inversol_puesto\">".$persona['Puesto']."</span></p>
+	</td>
+  </tr>
+  <tr height=\"10\"></tr>
+  <tr>
+	<td width=\"160\" style=\"border-right:2px solid #FBAB20;\">
+	  <img src=\"https://www.mercadoselectricos.com.sv/wp-content/uploads/2019/12/IMG_INVERSOL_Logo.png\" width=\"160\" height=\"100\">
+	</td>
+	<td width=\"900\" style=\"margin-left:2px;\">
+	  <table>
+		<tbody>
+		  <tr align=\"left\">
+			<td>
+			  <span style=\"color: #80888F\"><span class=\"inversol_yellow_text\">T.</span><span class=\"inversol_black_text\">".$persona['Telefono']."</span>
+			  <span class=\"inversol_yellow_text\">C.</span><span class=\"inversol_black_text\">".$persona['Celular']."</span></span>
+			</td>
+		  </tr>
+		  <tr>
+			<td>
+			  <a href=\"mailto:".$persona['Correo']."\"><span class=\"inversol_yellow_text\">".$email_id."</span><span class=\"inversol_black_text\">@".$email_domain."</span></a>
+			</td>
+		  </tr>
+		  <tr>
+			<td>
+			  <a href=\"https://www.".$persona['LinkedIn']."\"> <span class=\"inversol_black_text\">".$site."/".$type."/"."</span><span class=\"inversol_yellow_text\">".$identifier."</span></a>
+			</td>
+		  </tr>
+		  <tr>
+			<td>
+			  <table>
+				<tr>
+				  <td>
+					<a class=\"social_media\" href=\"https://www.linkedin.com/company/inverlecsolar/\">
+					  <img width=\"20\" height=\"20\" src=\"https://www.mercadoselectricos.com.sv/wp-content/uploads/2019/12/IMG_INVERSOL_Linkedin.png\">
+					</a>
+				  </td>
+				  <td>
+					<a class=\"social_media\" href=\"https://www.facebook.com/inverlec/\">
+					  <img width=\"20\" height=\"20\"  src=\"https://www.mercadoselectricos.com.sv/wp-content/uploads/2019/12/IMG_INVERSOL_Facebook.png\">
+					</a>
+				  </td>
+				  <td>
+					<a class=\"social_media\" href=\"https://www.inverlec.solar\">
+					  <span class=\"inversol_black_text\">www.</span><span class=\"inversol_yellow_text\">inverlec</span><span class=\"inversol_black_text\">.solar</span>
+					</a>
+				  </td>
+				</tr>
 			  </table>
-			</body>
-			</html>";
+			</td>
+		  </tr>
+		</tbody>
+	  </table>
+	</td>
+  </tr>
+</tbody>
+</table>
+</body>
+</html>
+";
 
 		}elseif($persona['Plantilla']=='METCO'){
 			$style = "@font-face{
@@ -584,21 +605,23 @@ class FirmaController extends CI_Controller {
 					src:url(../Tipografias/VAGRoundedStd-Light.otf);
 				}
 				.metco_name_yellow{
-					font-family: VAGRoundedStd-Light;
+					font-family: Helvetica, sans-serif;
 					color: #DE8C33;
-					font-size: 16pt;
+					font-size: 15pt;
+					font-weight: bold;
 				}
 				
 				.metco_name_black{
-					font-family: VAGRoundedStd-Light;
+					font-family: Helvetica, sans-serif;
 					color: black;
-					font-size: 16pt;
+					font-size: 15pt;
+					font-weight: bold;
 				}
 				
 				.metco_puesto{
-					font-family: VAGRoundedStd-Light;
+					font-family: Helvetica, sans-serif;
 					color: black;
-					font-size: 14pt;
+					font-size: 15pt;
 				}
 				
 				td{
@@ -607,84 +630,85 @@ class FirmaController extends CI_Controller {
 				.metco_yellow_text{
 				color: #DE8C33;
 				font-size: 11pt;
-				font-family: HelveticaNeueLTStd-Lt;
+				font-family: Helvetica, sans-serif;
+				font-weight: bold;
 				}
 				
 				.metco_gray_text{
 				color: black;
 				font-size: 11pt;
-				font-family: HelveticaNeueLTStd-Lt;
+				font-family: Helvetica, sans-serif;
 				}
 			";
 
-			$body ="  <table>
-			<tbody>
-			  <tr>
-				<td colspan=\"2\">
-				  <span class=\"metco_name_yellow\">".$persona['Primer Nombre']."</span> <span class=\"metco_name_black\">".$persona['Primer Apellido']."</span>
-				  <p style=\"margin-top:1%\"><span class=\"metco_puesto\">".$persona['Puesto']."</span></p>
-				</td>
-			  </tr>
-		
-			  <tr>
-				<td width=\"200\" style=\"border-right:2px solid #DE8C33;\">
-				  <img src=\"https://www.mercadoselectricos.com.sv/wp-content/uploads/2019/12/IMG_METCO_Logo.png\" width=\"200\" height=\"80\">
-				</td>
-				<td width=\"900\" style=\"margin-left:2px;\">
-		
-				  <table>
-					<tbody>
-					  <tr align=\"left\">
-						<td>
-						  <span style=\"color: #80888F\"><span class=\"metco_yellow_text\">T.</span><span class=\"metco_gray_text\">".$persona['Telefono']."</span> &nbsp;
-						  <span class=\"metco_yellow_text\">C.</span><span class=\"metco_gray_text\">".$persona['Celular']."</span></span>
-						</td>
-		
-					  </tr>
-					  <tr>
-						<td>
-						  <a href=\"mailto:".$persona['Correo']."\"><span class=\"metco_yellow_text\">".$email_id."</span><span class=\"metco_gray_text\">@".$email_domain."</span></a>
-						</td>
-					  </tr>
-					  <tr>
-						<td>
-						  <a href=\"https://www.".$persona['LinkedIn']."\"> <span class=\"metco_gray_text\">".$site."/".$type."/"."</span><span class=\"metco_yellow_text\">".$identifier."</span></a>
-						</td>
-					  </tr>
-					  <tr>
-						<td>
-		
-						  <table>
-							<tr>
-							  <td>
-								<a class=\"social_media\" href=\"https://www.linkedin.com/company/mexicanenergytradingco/\">
-								  <img width=\"20\" height=\"20\" src=\"https://www.mercadoselectricos.com.sv/wp-content/uploads/2019/12/IMG_METCO_Logo-02.png\">
-								</a>
-							  </td>
-							  <td>
-								<a class=\"social_media\" href=\"https://www.facebook.com/MexicanEnergyTradingCo/\">
-								  <img width=\"20\" height=\"20\"  src=\"https://www.mercadoselectricos.com.sv/wp-content/uploads/2019/12/IMG_METCO_Logo-03.png\">
-								</a>
-							  </td>
-							  <td>
-								<a class=\"social_media\" href=\"http://www.mexicantradingco.com.mx\">
-								  <span class=\"metco_gray_text\">www.</span><span class=\"metco_yellow_text\">mexicantradingco</span><span class=\"metco_gray_text\">.com.mx</span>
-								</a>
-							  </td>
-							</tr>
-						  </table>
-						</td>
-					  </tr>
-					</tbody>
-				  </table>
-		
-				</td>
-			  </tr>
-			</tbody>
-		  </table>
-		</body>
-		</html>
-		";
+	$body ="  <table>
+    <tbody>
+      <tr>
+        <td colspan=\"2\">
+          <span class=\"metco_name_yellow\">".$persona['Primer Nombre']."</span> <span class=\"metco_name_black\">".$persona['Primer Apellido']."</span>
+          <p style=\"margin-top:1%\"><span class=\"metco_puesto\">".$persona['Puesto']."</span></p>
+        </td>
+      </tr>
+      <tr height=\"10\"></tr>
+      <tr>
+        <td width=\"200\" style=\"border-right:2px solid #DE8C33;\">
+          <img src=\"https://www.mercadoselectricos.com.sv/wp-content/uploads/2019/12/IMG_METCO_Logo.png\" width=\"200\" height=\"80\">
+        </td>
+        <td width=\"900\" style=\"margin-left:2px;\">
+
+          <table>
+            <tbody>
+              <tr align=\"left\">
+                <td>
+                  <span style=\"color: #80888F\"><span class=\"metco_yellow_text\">T.</span><span class=\"metco_gray_text\">".$persona['Telefono']."</span> &nbsp;
+                  <span class=\"metco_yellow_text\">C.</span><span class=\"metco_gray_text\">".$persona['Celular']."</span></span>
+                </td>
+
+              </tr>
+              <tr>
+                <td>
+                  <a href=\"mailto:".$persona['Correo']."\"><span class=\"metco_yellow_text\">".$email_id."</span><span class=\"metco_gray_text\">@".$email_domain."</span></a>
+                </td>
+              </tr>
+              <tr>
+                <td>
+                  <a href=\"https://www.".$persona['LinkedIn']."\"> <span class=\"metco_gray_text\">".$site."/".$type."/"."</span><span class=\"metco_yellow_text\">".$identifier."</span></a>
+                </td>
+              </tr>
+              <tr>
+                <td>
+
+                  <table>
+                    <tr>
+                      <td>
+                        <a class=\"social_media\" href=\"https://www.linkedin.com/company/mexicanenergytradingco/\">
+                          <img width=\"20\" height=\"20\" src=\"https://www.mercadoselectricos.com.sv/wp-content/uploads/2019/12/IMG_METCO_Logo-02.png\">
+                        </a>
+                      </td>
+                      <td>
+                        <a class=\"social_media\" href=\"https://www.facebook.com/MexicanEnergyTradingCo/\">
+                          <img width=\"20\" height=\"20\"  src=\"https://www.mercadoselectricos.com.sv/wp-content/uploads/2019/12/IMG_METCO_Logo-03.png\">
+                        </a>
+                      </td>
+                      <td>
+                        <a class=\"social_media\" href=\"http://www.mexicantradingco.com.mx\">
+                          <span class=\"metco_gray_text\">www.</span><span class=\"metco_yellow_text\">mexicantradingco</span><span class=\"metco_gray_text\">.com.mx</span>
+                        </a>
+                      </td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+
+        </td>
+      </tr>
+    </tbody>
+  </table>
+</body>
+</html>
+";
 
 			}else{
 				$body = "";
@@ -703,12 +727,13 @@ $general_style ="
 		}
 		";
 
-		$html_header ="<html>
-		<head>
-		</head>
-		<body>
-		  <style> "." ".$style.$general_style."
-		  </style>";
+		
+$html_header ="<html>
+<head>
+</head>
+<body>
+<style> "." ".$style.$general_style."
+</style>";
 
 	fwrite($firma,$html_header.$body);
 

+ 6 - 5
application/views/INVER.php

@@ -4,18 +4,19 @@
 <body>
   <style>
   </style>
-  <link rel="stylesheet" href="../../public/css/fichas_style.css">
+  <link rel="stylesheet" href="<?php echo base_url('public/css/fichas_style.css');?>">
 <table>
     <tbody>
       <tr>
         <td colspan="2">
         <span class="inverlec_name_blue"><?= $persona['Primer Nombre']?></span> <span class="inverlec_name_black"><?= $persona['Primer Apellido']?></span>
-          <p style="margin-top:1%"><span class="inverlec_name_black"><?= $persona['Puesto']?></span></p>
+          <p style="margin-top:1%"><span class="inverlec_puesto"><?= $persona['Puesto']?></span></p>
+          <br>
         </td>
       </tr>
-
+      <tr height="10"></tr>
       <tr>
-        <td width="160" style="border-right:2px solid #436DAA;">
+        <td width="160" style="border-right:2px solid #00ABE7;">
           <img src="https://www.mercadoselectricos.com.sv/wp-content/uploads/2019/12/IMG_INVER_Logo.png" width="160" height="90">
         </td>
         <td width="900" style="margin-left:2px;" >
@@ -23,7 +24,7 @@
             <tbody>
               <tr align="left">
                 <td>
-                <span style="color: #80888F"><span class="inverlec_blue_text">T.</span><span class="inverlec_black_text"><?= $persona['Telefono']?></span> &nbsp;
+                <span style="color: #80888F"><span class="inverlec_blue_text">T.</span><span class="inverlec_black_text"><?= $persona['Telefono']?></span> 
                   <span class="inverlec_blue_text">C.</span><span class="inverlec_black_text"><?= $persona['Celular']?></span></span>
                 </td>
 

+ 4 - 4
application/views/INVERSOL.php

@@ -4,16 +4,16 @@
 <body>
   <style>
   </style>
-  <link rel="stylesheet" href="../../public/css/fichas_style.css">
+  <link rel="stylesheet" href="<?php echo base_url('public/css/fichas_style.css');?>">
   <table>
     <tbody>
       <tr>
         <td colspan="2">
         <span class="inversol_name_yellow"><?= $persona['Primer Nombre']?></span> <span class="inversol_name_black"><?= $persona['Primer Apellido']?></span>
-          <p style="margin-top:1%"> <span class="inversol_name_black"><?= $persona['Puesto']?></span></p>
+          <p style="margin-top:1%"> <span class="inversol_puesto"><?= $persona['Puesto']?></span></p>
         </td>
       </tr>
-
+      <tr height="10"></tr>
       <tr>
         <td width="160" style="border-right:2px solid #FBAB20;">
           <img src="https://www.mercadoselectricos.com.sv/wp-content/uploads/2019/12/IMG_INVERSOL_Logo.png" width="160" height="100">
@@ -23,7 +23,7 @@
             <tbody>
               <tr align="left">
                 <td>
-                  <span style="color: #80888F"><span class="inversol_yellow_text">T.</span><span class="inversol_black_text"><?= $persona['Telefono']?></span> &nbsp;
+                  <span style="color: #80888F"><span class="inversol_yellow_text">T.</span><span class="inversol_black_text"><?= $persona['Telefono']?></span> 
                   <span class="inversol_yellow_text">C.</span><span class="inversol_black_text"><?= $persona['Celular'] ?></span></span>
                 </td>
               </tr>

+ 3 - 3
application/views/MER.php

@@ -4,7 +4,8 @@
 <body>
   <style>
   </style>
-  <link rel="stylesheet" href="../../public/css/fichas_style.css">
+  <link rel="stylesheet" href="<?php echo base_url('public/css/fichas_style.css');?>">
+  
   <table>
     <tbody>
       <tr>
@@ -13,7 +14,7 @@
           <p style="margin-top:1%"><span class="merelec_puesto"><?=$persona['Puesto']?></span></p>
         </td>
       </tr>
-
+      <tr height="10"></tr>
       <tr>
         <td width="200" style="border-right:2px solid #80888F;">
           <img src="https://www.mercadoselectricos.com.sv/wp-content/uploads/2019/12/IMG_MER_Logo.png" width="200" height="90">
@@ -61,7 +62,6 @@
               </tr>
             </tbody>
           </table>
-        </div>
       </td>
     </tr>
   </tbody>

+ 2 - 2
application/views/METCO.php

@@ -4,7 +4,7 @@
 <body>
   <style>
   </style>
-  <link rel="stylesheet" href="../../public/css/fichas_style.css">
+  <link rel="stylesheet" href="<?php echo base_url('public/css/fichas_style.css');?>">
   <table>
     <tbody>
       <tr>
@@ -13,7 +13,7 @@
           <p style="margin-top:1%"><span class="metco_puesto"><?= $persona['Puesto']?></span></p>
         </td>
       </tr>
-
+      <tr height="10"></tr>
       <tr>
         <td width="200" style="border-right:2px solid #DE8C33;">
           <img src="https://www.mercadoselectricos.com.sv/wp-content/uploads/2019/12/IMG_METCO_Logo.png" width="200" height="80">

+ 0 - 0
system_files/datos_firmas.xlsx → firmas_generadas/datos_firmas.xlsx


+ 43 - 19
public/css/fichas_style.css

@@ -16,40 +16,49 @@
 
 /*fuentes MERELEC*/
 @font-face{
-    font-family:GOTHICBI;
-    src:url(../../../public/Tipografias/GOTHICB.ttf);
+    font-family:HelveticaNeueLTStd-Lt;
+    src:url(../../../public/Tipografias/HelveticaNeueLTStd-Lt.ttf);
     }
 
 /*fuentes INVERLEC*/
 @font-face{
     font-family:HelveticaNeueLTStd-Lt;
-    src:url(../../../public/Tipografias/HelveticaNeueLTStd-Lt.otf);
+    src:url(../../../public/Tipografias/HelveticaNeueLTStd-Lt.optf);
     }
 
 /*Colores INVERSOL*/
     .inversol_name_yellow{
-        font-family: HelveticaNeueLTStd-Lt;
+        font-family: Arial, Helvetica, sans-serif;
         color: #F78D27;
         font-size: 25px;
+        font-weight: bold;
     }
     .inversol_name_black{
-      font-family: HelveticaNeueLTStd-Lt;
+        font-family: Arial, Helvetica, sans-serif;
       color: black;
       font-size: 25px;
+      font-weight: bold;
     }
-    td{
-        font-family: HelveticaNeueLTStd-Lt;
-    }
+
+    .inversol_puesto{
+        font-family: Arial, Helvetica, sans-serif;
+        color: black;
+        font-size: 25px;
+
+      }
+
+
 
   .inversol_yellow_text{
     color: #F78D27;
-    font-family: HelveticaNeueLTStd-Lt;
+    font-family: Arial, Helvetica, sans-serif;
     font-size: 20px;
+    font-weight: bold;
   }
 
   .inversol_black_text{
     color: black;
-    font-family: HelveticaNeueLTStd-Lt;
+    font-family: Arial, Helvetica, sans-serif;
     font-size: 20px;
   }
 
@@ -59,12 +68,14 @@
     font-family: VAGRoundedStd-Light;
     color: #DE8C33;
     font-size: 19pt;
+    font-weight: bold;
 }
 
 .metco_name_black{
     font-family: VAGRoundedStd-Light;
     color: black;
     font-size: 19pt;
+    font-weight: bold;
 }
 
 .metco_puesto{
@@ -80,6 +91,7 @@ td{
 color: #DE8C33;
 font-size: 14pt;
 font-family: HelveticaNeueLTStd-Lt;
+font-weight: bold;
 }
 
 .metco_gray_text{
@@ -90,29 +102,32 @@ font-family: HelveticaNeueLTStd-Lt;
 
 /*Colores MERELEC*/
 font{
-    font-family: GOTHICBI;
+    font-family: HelveticaNeueLTStd-Lt;
 }
 
 td{
-    font-family: GOTHICBI;
+    font-family: HelveticaNeueLTStd-Lt;
 }
 
 .merelec_name_yellow{
-    font-family: GOTHICBI;
+    font-family: HelveticaNeueLTStd-Lt;
     color: #FCB122;
     font-size: 18pt;
+    font-weight: bold;
 }
 
 .merelec_name_gray{
-    font-family: GOTHICBI;
+    font-family: HelveticaNeueLTStd-Lt;
     color: #80888F;
     font-size: 18pt;
+    font-weight: bold;
 }
 
 
 .merelec_yellow_text{
 color: #FCB122;
 font-size: 14pt;
+font-weight: bold;
 }
 
 .merelec_gray_text{
@@ -121,7 +136,7 @@ font-size: 14pt;
 }
 
 .merelec_puesto{
-    font-family: GOTHICBI;
+    font-family: HelveticaNeueLTStd-Lt;
     color: #80888F;
     font-size: 17pt;
 }
@@ -129,23 +144,32 @@ font-size: 14pt;
 /*colores INVERLEC*/
 
 .inverlec_name_blue{
-    font-family: HelveticaNeueLTStd-Lt;
-    color: #436DAA;
+    font-family: Arial, Helvetica, sans-serif;
+    color: #00ABE7;
     font-size: 25px;
+    font-weight: bold;
 }
 .inverlec_name_black{
-  font-family: HelveticaNeueLTStd-Lt;
+    font-family: Arial, Helvetica, sans-serif;
   color: black;
   font-size: 25px;
+  font-weight: bold;
 }
+
+.inverlec_puesto{
+    font-family: HelveticaNeueLTStd-Lt;
+    color: black;
+    font-size: 25px;
+  }
 td{
     font-family: HelveticaNeueLTStd-Lt;
 }
 
 .inverlec_blue_text{
-color: #436DAA;
+color: #00ABE7;
 font-family: HelveticaNeueLTStd-Lt;
 font-size: 20px;
+font-weight: bold;
 }
 
 .inverlec_black_text{